Specs

spec/controllers/api/v1/feed_versions_controller_spec.rb

@@ -94,14 +94,24 @@
       expect(feed.feed_versions.first.sha1).to eq(sha1)
     end
 
-    it 'enqueues GTFSValidationWorker' do
+    it 'enqueues GTFSGoogleValidationWorker' do
       expect {
         post :create, feed_version: {
           feed_onestop_id: feed.onestop_id,
           url: url,
           file: file
         }
-      }.to change(GTFSValidationWorker.jobs, :size).by(1)
+      }.to change(GTFSGoogleValidationWorker.jobs, :size).by(1)
+    end
+
+    it 'enqueues GTFSConveyalValidationWorker' do
+      expect {
+        post :create, feed_version: {
+          feed_onestop_id: feed.onestop_id,
+          url: url,
+          file: file
+        }
+      }.to change(GTFSConveyalValidationWorker.jobs, :size).by(1)
     end
 
     it 'enqueues GTFSStatisticsWorker' do

spec/services/feed_fetcher_service_spec.rb

@@ -108,15 +108,27 @@
       expect(Issue.issues_of_entity(feed).count).to eq 0
     end
 
-    it 'creates GTFSValidationWorker job' do
+    it 'creates GTFSGoogleValidationWorker job' do
       allow(Figaro.env).to receive(:run_google_validator) { 'true' }
       feed = create(:feed_caltrain)
       Sidekiq::Testing.fake! do
         expect {
           VCR.use_cassette('feed_fetch_caltrain') do
             FeedFetcherService.fetch_and_return_feed_version(feed)
           end
-        }.to change(GTFSValidationWorker.jobs, :size).by(1)
+        }.to change(GTFSGoogleValidationWorker.jobs, :size).by(1)
+      end
+    end
+
+    it 'creates GTFSConveyalValidationWorker job' do
+      allow(Figaro.env).to receive(:run_conveyal_validator) { 'true' }
+      feed = create(:feed_caltrain)
+      Sidekiq::Testing.fake! do
+        expect {
+          VCR.use_cassette('feed_fetch_caltrain') do
+            FeedFetcherService.fetch_and_return_feed_version(feed)
+          end
+        }.to change(GTFSConveyalValidationWorker.jobs, :size).by(1)
       end
     end
   end

spec/workers/gtfs_validation_worker_spec.rb → spec/workers/gtfs_conveyal_validation_worker_spec.rb

@@ -1,18 +1,15 @@
-describe GTFSValidationWorker do
+describe GTFSConveyalValidationWorker do
   before(:each) {
-    allow(Figaro.env).to receive(:run_google_validator) { 'true' }
     allow(Figaro.env).to receive(:run_conveyal_validator) { 'true' }
-    allow(GTFSValidationService).to receive(:run_google_validator) { Tempfile.new(['test','.html']) }
     allow(GTFSValidationService).to receive(:run_conveyal_validator) { Tempfile.new(['test','.json']) }
   }
 
   context 'runs GTFSValidationService' do
     it 'attaches output' do
       feed_version = create(:feed_version_example)
       Sidekiq::Testing.inline! do
-        GTFSValidationWorker.perform_async(feed_version.sha1)
+        GTFSConveyalValidationWorker.perform_async(feed_version.sha1)
       end
-      expect(feed_version.reload.file_feedvalidator.url).to end_with('.html')
       expect(feed_version.reload.feed_version_infos.where(type: 'FeedVersionInfoConveyalValidation').count).to eq(1)
     end
   end

spec/workers/gtfs_google_validation_worker_spec.rb

@@ -0,0 +1,16 @@
+describe GTFSGoogleValidationWorker do
+  before(:each) {
+    allow(Figaro.env).to receive(:run_google_validator) { 'true' }
+    allow(GTFSValidationService).to receive(:run_google_validator) { Tempfile.new(['test','.html']) }
+  }
+
+  context 'runs GTFSValidationService' do
+    it 'attaches output' do
+      feed_version = create(:feed_version_example)
+      Sidekiq::Testing.inline! do
+        GTFSGoogleValidationWorker.perform_async(feed_version.sha1)
+      end
+      expect(feed_version.reload.file_feedvalidator.url).to end_with('.html')
+    end
+  end
+end