Get integration test working for concourse V2 projects [#131657693]

Signed-off-by: Ian Fisher <[email protected]>

Author: Elana Koren

lib/concourse_authenticator.rb

@@ -19,11 +19,11 @@ def authenticate(url, username, password)
       end
 
       request.errback do |client|
-        # do we actually want to yield this?
         yield PollState::FAILED, client.error
       end
     else
       puts 'Error: Is your Concourse project set up correctly?'
+      yield PollState::FAILED
     end
   end
 end

lib/concourse_project_strategy.rb

@@ -10,13 +10,13 @@ def create_handler(project)
 
   def create_workload(project)
     workload = PollerWorkload.new
-    workload.add_job(:concourse_project, project)
+    workload.add_job(:concourse_project, project.feed_url)
     workload
   end
 
   # returns a request that gets callback/errback assigned to it
   def fetch_status(project, url)
-    @concourse_authenticator.authenticate do |session_token|
+    @concourse_authenticator.authenticate(project.auth_url, project.auth_username, project.auth_password) do |session_token|
       request_options = {
           head: {'Set-Cookie' => "ATC-Authorization=Bearer #{session_token}"}
       }
@@ -30,7 +30,6 @@ def fetch_status(project, url)
 
       request.callback do |client|
         yield PollState::SUCCEEDED, client.response
-
       end
 
       request.errback do |client|

spec/integration/project_polling_scheduler_spec.rb

@@ -40,6 +40,23 @@
       expect(p.tracker_online).to eq(true)
     end
 
+    it 'should update concourse (V2) projects' do
+      project = create(:concourse_project)
+      project.update_attributes(
+          ci_base_url: 'https://jetway.pivotal.io',
+          ci_build_identifier: 'build',
+          concourse_pipeline_name: 'augur-production',
+      )
+
+      log_entry_count = PayloadLogEntry.count
+
+      VCR.use_cassette('poller_concourse_run_once') do
+        subject.run_once
+      end
+
+      expect(PayloadLogEntry.count).to eq(log_entry_count + 1)
+    end
+
     it 'should exit gracefully when there are no projects' do
       Project.delete_all
 

spec/lib/concourse_authenticator_spec.rb

@@ -34,9 +34,19 @@
 
       it 'should log an error' do
         expect {
-          subject.authenticate('https://auth/url', 'user', 'pass')
+          subject.authenticate('https://auth/url', 'user', 'pass') {}
         }.to output(/Error/).to_stdout
       end
+
+      it 'should yield a failure' do
+        flag = false
+
+        subject.authenticate('url', 'uname', 'pw') do |_flag, response|
+          flag = _flag
+        end
+
+        expect(flag).to eq(PollState::FAILED)
+      end
     end
 
     context 'when the request fails because of a network error' do

spec/lib/concourse_project_strategy_spec.rb

@@ -4,7 +4,11 @@
   let(:request_double) { double(:request) }
   let(:client_double) { double(:client, response: 'some response', error: 'some error') }
   let(:requester) { double(:http_requester, initiate_request: request_double) }
-  let(:project) { build(:concourse_project) }
+  let(:project) { build(:concourse_project,
+                        ci_base_url: 'http://concourse.com',
+                        auth_username: 'me',
+                        auth_password: 'pw')
+  }
   let(:concourse_authenticator) { double(:concourse_authenticator) }
 
   subject { ConcourseProjectStrategy.new(requester, concourse_authenticator) }
@@ -15,7 +19,7 @@
     before do
       allow(request_double).to receive(:callback).and_return(client_double)
       allow(request_double).to receive(:errback).and_return(client_double)
-      allow(concourse_authenticator).to receive(:authenticate).and_yield('session-token')
+      allow(concourse_authenticator).to receive(:authenticate).with(project.auth_url, project.auth_username, project.auth_password).and_yield('session-token')
     end
 
     it 'makes a request to the auth endpoint, then makes a request for the build status' do