shipit-engine 0.21.0 → 0.22.0

data/test/models/team_test.rb

@@ -11,9 +11,9 @@ module Shipit
     end
 
     test ".find_or_create_by_handle fetch the team from github if it's not in the db already" do
-      Shipit.github_api.expects(:org_teams).with('shopify', per_page: 100)
+      Shipit.github.api.expects(:org_teams).with('shopify', per_page: 100)
       response = stub(rels: {}, data: [new_team])
-      Shipit.github_api.expects(:last_response).returns(response)
+      Shipit.github.api.expects(:last_response).returns(response)
       assert_difference -> { Team.count }, 1 do
         Team.find_or_create_by_handle('Shopify/new-team')
       end
@@ -21,7 +21,7 @@ module Shipit
 
     test "#refresh_members! fetch all the team members from github" do
       response = stub(rels: {members: members_resource})
-      Shipit.github_api.expects(:get).with(@team.api_url).returns(response)
+      Shipit.github.api.expects(:get).with(@team.api_url).returns(response)
       assert_difference -> { User.count }, 1 do
         @team.refresh_members!
       end

data/test/models/users_test.rb

@@ -69,7 +69,7 @@ module Shipit
     end
 
     test "#refresh_from_github! update the user with the latest data from GitHub's API" do
-      Shipit.github_api.expects(:user).with(@user.github_id).returns(@github_user)
+      Shipit.github.api.expects(:user).with(@user.github_id).returns(@github_user)
       @user.refresh_from_github!
       @user.reload
 
@@ -82,8 +82,8 @@ module Shipit
       user.update!(github_id: @github_user.id)
       commit = user.authored_commits.last
 
-      Shipit.github_api.expects(:user).with(user.github_id).raises(Octokit::NotFound)
-      Shipit.github_api.expects(:commit).with(commit.github_repo_name, commit.sha).returns(mock(author: @github_user))
+      Shipit.github.api.expects(:user).with(user.github_id).raises(Octokit::NotFound)
+      Shipit.github.api.expects(:commit).with(commit.github_repo_name, commit.sha).returns(mock(author: @github_user))
 
       assert_equal 'bob', user.login
 
@@ -99,12 +99,12 @@ module Shipit
       assert_equal @user.github_access_token, @user.github_api.access_token
     end
 
-    test "#github_api fallbacks to Shipit.github_api if the user doesn't have an access_token" do
-      assert_equal Shipit.github_api, shipit_users(:bob).github_api
+    test "#github_api fallbacks to Shipit.github.api if the user doesn't have an access_token" do
+      assert_equal Shipit.github.api, shipit_users(:bob).github_api
     end
 
-    test "#github_api fallbacks to Shipit.github_api for anonymous users" do
-      assert_equal Shipit.github_api, AnonymousUser.new.github_api
+    test "#github_api fallbacks to Shipit.github.api for anonymous users" do
+      assert_equal Shipit.github.api, AnonymousUser.new.github_api
     end
 
     test "users with legacy encrypted access token get their token reset automatically" do

data/test/test_helper.rb

@@ -43,7 +43,7 @@ class ActiveSupport::TestCase
   setup do
     @routes = Shipit::Engine.routes
     Process.stubs(:kill)
-    Shipit.github_api.stubs(:login).returns('shipit')
+    Shipit.github.api.stubs(:login).returns('shipit')
   end
 
   teardown do

data/test/unit/github_app_test.rb

@@ -0,0 +1,44 @@
+require 'test_helper'
+
+module Shipit
+  class GitHubAppTest < ActiveSupport::TestCase
+    setup do
+      @github = app
+      @enterprise = app(domain: 'github.example.com')
+    end
+
+    test "#initialize doesn't raise if given an empty config" do
+      assert_nothing_raised do
+        GitHubApp.new({})
+      end
+    end
+
+    test "#domain defaults to github.com" do
+      assert_equal 'github.com', @github.domain
+    end
+
+    test "#url returns the HTTPS url to the github installation" do
+      assert_equal 'https://github.example.com', @enterprise.url
+      assert_equal 'https://github.example.com/foo/bar', @enterprise.url('/foo/bar')
+      assert_equal 'https://github.example.com/foo/bar/baz', @enterprise.url('foo/bar', 'baz')
+    end
+
+    test "#oauth_config.last[:client_options] is nil if domain is not overriden" do
+      assert_nil @github.oauth_config.last[:client_options][:site]
+    end
+
+    test "#oauth_config.last[:client_options] returns Enterprise endpoint if domain is overriden" do
+      assert_equal 'https://github.example.com/api/v3/', @enterprise.oauth_config.last[:client_options][:site]
+    end
+
+    private
+
+    def app(extra_config = {})
+      GitHubApp.new(default_config.deep_merge(extra_config))
+    end
+
+    def default_config
+      Rails.application.secrets.github.deep_dup
+    end
+  end
+end

data/test/unit/shipit_test.rb

@@ -6,60 +6,13 @@ module Shipit
       Shipit.instance_variables.each(&Shipit.method(:remove_instance_variable))
     end
 
-    test ".github_domain defaults to github.com" do
-      assert_equal 'github.com', Shipit.github_domain
-    end
-
-    test ".github_domain can be overriden" do
-      Rails.application.secrets.stubs(:github_domain).returns('github.example.com')
-      assert_equal 'github.example.com', Shipit.github_domain
-    end
-
-    test ".github_enterprise? returns false if github_domain is not overriden" do
-      refute Shipit.github_enterprise?
-    end
-
-    test ".github_enterprise? returns true if github_domain is overriden" do
-      Rails.application.secrets.stubs(:github_domain).returns('github.example.com')
-      assert Shipit.github_enterprise?
-    end
-
-    test ".github_url returns the HTTPS url to the github installation" do
-      Rails.application.secrets.stubs(:github_domain).returns('github.example.com')
-      assert_equal 'https://github.example.com', Shipit.github_url
-      assert_equal 'https://github.example.com/foo/bar', Shipit.github_url('/foo/bar')
-      assert_equal 'https://github.example.com/foo/bar', Shipit.github_url('foo/bar')
-    end
-
-    test ".github_api_endpoint returns nil if github_domain is not overriden" do
-      assert_nil Shipit.github_api_endpoint
-    end
-
-    test ".github_api_endpoint returns Enterprise endpoint if github_domain is overriden" do
-      Rails.application.secrets.stubs(:github_domain).returns('github.example.com')
-      assert_equal 'https://github.example.com/api/v3/', Shipit.github_api_endpoint
-    end
-
-    test ".github_oauth_options returns an empty hash if not enterprise" do
-      refute Shipit.github_enterprise?
-      assert_equal({}, Shipit.github_oauth_options)
-    end
-
     test ".github_teams returns an empty array if there's no team" do
       assert_equal([], Shipit.github_teams)
     end
 
-    test ".github_teams returns the team key as an array" do
-      Rails.application.secrets.stubs(:github_oauth).returns('team' => 'shopify/developers')
+    test ".github_teams returns the teams key as an array of Team" do
+      Shipit.github.stubs(:oauth_teams).returns(['shopify/developers'])
       assert_equal(['shopify/developers'], Shipit.github_teams.map(&:handle))
     end
-
-    test ".github_teams merges the teams and team keys in a single array" do
-      Rails.application.secrets.stubs(:github_oauth).returns(
-        'team' => 'shopify/developers',
-        'teams' => ['shopify/developers', 'cyclimse/cooks'],
-      )
-      assert_equal(['cyclimse/cooks', 'shopify/developers'], Shipit.github_teams.map(&:handle))
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shipit-engine
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.22.0
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-16 00:00:00.000000000 Z
+date: 2018-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -423,6 +423,7 @@ files:
 - app/assets/images/ship.png
 - app/assets/images/success-small.svg
 - app/assets/images/success.svg
+- app/assets/images/timedout.svg
 - app/assets/images/unknown.svg
 - app/assets/images/validation/invalid.png
 - app/assets/images/validation/required.png
@@ -506,6 +507,7 @@ files:
 - app/jobs/shipit/create_on_github_job.rb
 - app/jobs/shipit/deferred_touch_job.rb
 - app/jobs/shipit/deliver_hook_job.rb
+- app/jobs/shipit/destroy_job.rb
 - app/jobs/shipit/destroy_stack_job.rb
 - app/jobs/shipit/emit_event_job.rb
 - app/jobs/shipit/fetch_commit_stats_job.rb
@@ -662,6 +664,7 @@ files:
 - db/migrate/20170904103242_reindex_deliveries.rb
 - db/migrate/20171120161420_add_base_info_to_pull_request.rb
 - db/migrate/20180202220850_add_aborted_by_to_tasks.rb
+- db/migrate/20180417130436_remove_all_github_hooks.rb
 - lib/shipit-engine.rb
 - lib/shipit.rb
 - lib/shipit/command.rb
@@ -671,7 +674,9 @@ files:
 - lib/shipit/engine.rb
 - lib/shipit/environment_variables.rb
 - lib/shipit/first_parent_commits_iterator.rb
+- lib/shipit/github_app.rb
 - lib/shipit/null_serializer.rb
+- lib/shipit/octokit_bot_users_patch.rb
 - lib/shipit/octokit_iterator.rb
 - lib/shipit/paginator.rb
 - lib/shipit/rollback_commands.rb
@@ -697,7 +702,6 @@ files:
 - lib/tasks/cron.rake
 - lib/tasks/dev.rake
 - lib/tasks/teams.rake
-- lib/tasks/webhook.rake
 - test/controllers/api/base_controller_test.rb
 - test/controllers/api/ccmenu_controller_test.rb
 - test/controllers/api/commits_controller_test.rb
@@ -845,6 +849,7 @@ files:
 - test/unit/csv_serializer_test.rb
 - test/unit/deploy_commands_test.rb
 - test/unit/environment_variables_test.rb
+- test/unit/github_app_test.rb
 - test/unit/github_url_helper_test.rb
 - test/unit/shipit_test.rb
 - test/unit/variable_definition_test.rb
@@ -884,6 +889,7 @@ test_files:
 - test/unit/command_test.rb
 - test/unit/commands_test.rb
 - test/unit/deploy_commands_test.rb
+- test/unit/github_app_test.rb
 - test/unit/github_url_helper_test.rb
 - test/unit/variable_definition_test.rb
 - test/unit/csv_serializer_test.rb

data/lib/tasks/webhook.rake

@@ -1,6 +0,0 @@
-namespace :webhook do
-  desc "get all the webhooks back in sync"
-  task sync_all: [:environment] do
-    Shipit::Stack.find_each(&:setup_hooks)
-  end
-end