shipit-engine 0.42.0 → 0.42.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92deb69f7e1cf311777e4de1f80c95055d85b13bf28bba0cfa867d998a469620
-  data.tar.gz: d201434b2619d1d1cd5b089656b5acbeeadc842cab75da2d4051f51a2013d497
+  metadata.gz: c95a2e049279a481503f3ed07a634d3926c1533ddd3b228cde55c3b324df1af1
+  data.tar.gz: b33f1940ee6d4f3909fca272a439604740899a37caa5f11f875ffe543d4332df
 SHA512:
-  metadata.gz: 701903483ad7438eb46f1624c75bdcc893d9be84cf2f3926c0987cc257bd55b95e4c4e0703c85bf2db8c0ae7429c4e03ae1fe28e294a24cdca26f4d321e82d11
-  data.tar.gz: 80a26fdee216be7713a1aa6389e3ec9b304f494514eed6d14d24bf7dd6b4466821ce8b54c12d4a3e291f49bfc20585a178d2eef581e74f846ac1c532e00d9b35
+  metadata.gz: d89afad83961d8ef42c6011116451e2025719345d4aa753a62dae3dac0f59370d33ed71261e812f6bd16bf20583cd29c300023d833db4dda8e851ff5ac068f3e
+  data.tar.gz: f3c90b17a66f5a14e2489869c636206cd5f5a55465d2bd58ab4a947cb82d4fe99cbd1cb057d4d1f8a195417d8964b2d3c66a65c1a115f381cb63b20f4b6aa298

data/app/models/shipit/commit.rb

@@ -173,23 +173,21 @@ module Shipit
         stack.github_api.check_runs(github_repo_name, sha, per_page: 100)
       end
 
-      return response if stack.github_api.last_response.rels[:next].nil?
+      yield response.check_runs
 
-      loop do
+      until stack.github_api.last_response.rels[:next].nil?
         page = stack.handle_github_redirections do
           stack.github_api.get(stack.github_api.last_response.rels[:next].href)
         end
-        response.check_runs.concat(page.check_runs)
-        break if stack.github_api.last_response.rels[:next].nil?
+        yield page.check_runs
       end
-
-      response
     end
 
     def refresh_check_runs!
-      response = paginated_check_runs
-      response.check_runs.each do |check_run|
-        create_or_update_check_run_from_github!(check_run)
+      paginated_check_runs do |check_runs|
+        check_runs.each do |check_run|
+          create_or_update_check_run_from_github!(check_run)
+        end
       end
     end
 

data/lib/shipit/commands.rb

@@ -35,11 +35,18 @@ module Shipit
     private
 
     def base_env
-      @base_env ||= Shipit.env.merge(
-        'GITHUB_DOMAIN' => github.domain,
-        'GITHUB_TOKEN' => github.token,
-        'GIT_ASKPASS' => Shipit::Engine.root.join('lib', 'snippets', 'git-askpass').realpath.to_s
-      )
+      @base_env ||= begin
+        env = Shipit.env.merge(
+          'GITHUB_DOMAIN' => github.domain,
+          'GITHUB_TOKEN' => github.token
+        )
+
+        unless Rails.env.development? || Rails.env.test?
+          env['GIT_ASKPASS'] = Shipit::Engine.root.join('lib', 'snippets', 'git-askpass').realpath.to_s
+        end
+
+        env
+      end
     end
 
     def github

data/lib/shipit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Shipit
-  VERSION = '0.42.0'
+  VERSION = '0.42.1'
 end

data/test/models/commits_test.rb

@@ -367,6 +367,75 @@ module Shipit
       assert_equal 'success', @commit.check_runs.first.state
     end
 
+    test "refresh_check_runs! handles paginated responses from github" do
+      # First page check runs
+      check_run1 = mock(
+        id: 111_111_111_111_111,
+        name: 'Test suite 1',
+        conclusion: 'success',
+        details_url: 'https://example.com/details/1',
+        html_url: 'https://example.com/run/1',
+        output: mock(
+          title: 'Tests build 1 ran successfully'
+        ),
+        completed_at: Time.now,
+        started_at: Time.now - 1.minute
+      )
+      check_run2 = mock(
+        id: 222_222_222_222_222,
+        name: 'Test suite 2',
+        conclusion: 'failure',
+        details_url: 'https://example.com/details/2',
+        html_url: 'https://example.com/run/2',
+        output: mock(
+          title: 'Tests build 2 failed'
+        ),
+        completed_at: Time.now,
+        started_at: Time.now - 2.minutes
+      )
+
+      # Second page check runs
+      check_run3 = mock(
+        id: 333_333_333_333_333,
+        name: 'Test suite 3',
+        conclusion: 'success',
+        details_url: 'https://example.com/details/3',
+        html_url: 'https://example.com/run/3',
+        output: mock(
+          title: 'Tests build 3 skipped'
+        ),
+        completed_at: Time.now,
+        started_at: Time.now - 3.minutes
+      )
+
+      next_link = stub(href: 'https://api.github.com/repos/test/repo/check-runs?page=2')
+      first_response = stub(rels: { next: next_link }, data: mock(check_runs: [check_run1, check_run2]))
+      second_response = stub(rels: {}, data: mock(check_runs: [check_run3]))
+
+      call_sequence = sequence('api_calls')
+      Shipit.github.api.expects(:check_runs).with(@stack.github_repo_name, @commit.sha, per_page: 100).returns(first_response.data).in_sequence(call_sequence)
+      Shipit.github.api.expects(:last_response).returns(first_response).in_sequence(call_sequence)
+      Shipit.github.api.expects(:last_response).returns(first_response).in_sequence(call_sequence)
+      Shipit.github.api.expects(:get).with(next_link.href).returns(second_response.data).in_sequence(call_sequence)
+      Shipit.github.api.expects(:last_response).returns(second_response).in_sequence(call_sequence)
+
+      assert_difference -> { @commit.check_runs.count }, 3 do
+        @commit.refresh_check_runs!
+      end
+
+      check1 = @commit.check_runs.find_by(github_id: 111_111_111_111_111)
+      assert_not_nil check1
+      assert_equal 'success', check1.state
+
+      check2 = @commit.check_runs.find_by(github_id: 222_222_222_222_222)
+      assert_not_nil check2
+      assert_equal 'failure', check2.state
+
+      check3 = @commit.check_runs.find_by(github_id: 333_333_333_333_333)
+      assert_not_nil check3
+      assert_equal 'success', check3.state
+    end
+
     test "#creating a commit update the undeployed_commits_count" do
       walrus = shipit_users(:walrus)
       assert_equal 2, @stack.undeployed_commits_count

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shipit-engine
 version: !ruby/object:Gem::Version
-  version: 0.42.0
+  version: 0.42.1
 platform: ruby
 authors:
 - Jean Boussier