shipit-engine 0.20.0 → 0.21.0

data/test/models/stacks_test.rb

@@ -4,7 +4,7 @@ module Shipit
   class StacksTest < ActiveSupport::TestCase
     def setup
       @stack = shipit_stacks(:shipit)
-      @expected_base_path = Rails.root.join('data/stacks', @stack.to_param).to_s
+      @expected_base_path = Rails.root.join('data', 'stacks', @stack.to_param).to_s
       GithubHook.any_instance.stubs(:teardown!)
     end
 
@@ -441,14 +441,14 @@ module Shipit
       @stack.deploys_and_rollbacks.destroy_all
       @stack.update_undeployed_commits_count
       @stack.reload
-      assert_equal 'backlogged', @stack.merge_status
+      assert_equal 'backlogged', @stack.merge_status(backlog_leniency_factor: 1.5)
     end
 
     test "#merge_status returns success with a higher leniency factor" do
       @stack.deploys_and_rollbacks.destroy_all
       @stack.update_undeployed_commits_count
       @stack.reload
-      assert_equal 'success', @stack.merge_status(backlog_leniency_factor: 2.0)
+      assert_equal 'success', @stack.merge_status(backlog_leniency_factor: 3.0)
     end
 
     test "#handle_github_redirections update the stack if the repository was renamed" do
@@ -573,38 +573,42 @@ module Shipit
       assert_equal shipit_commits(:third), @stack.next_commit_to_deploy
     end
 
-    test "#lock sets reason, user and locked_since" do
+    test "setting #lock_reason also sets #locked_since" do
+      assert_predicate @stack.locked_since, :nil?
+
+      @stack.update!(lock_reason: "Here comes the walrus")
+      refute_predicate @stack.locked_since, :nil?
+
+      @stack.update!(lock_reason: nil)
+      assert_predicate @stack.locked_since, :nil?
+    end
+
+    test "updating #lock_reason preserves #locked_since" do
+      @stack.update!(lock_reason: "Here comes the walrus")
+      expected = @stack.locked_since
+
+      @stack.update!(lock_reason: "The walrus strikes back")
+      assert_equal expected, @stack.locked_since
+    end
+
+    test "#lock sets reason and user" do
       reason = "Here comes the walrus"
       user = shipit_users(:walrus)
       @stack.lock(reason, user)
       assert @stack.locked?
       assert_equal reason, @stack.lock_reason
       assert_equal user, @stack.lock_author
-      assert_not_nil user, @stack.locked_since
     end
 
-    test "#unlock deletes reason, user and locked_since" do
+    test "#unlock deletes reason and user" do
       user = shipit_users(:walrus)
       @stack.lock("Here comes the walrus", user)
       @stack.unlock
       refute @stack.locked?
       assert_nil @stack.lock_reason
-      assert_nil @stack.locked_since
       assert_not_equal user, @stack.lock_author
     end
 
-    test "#lock does not overwrite locked_since if already locked" do
-      @stack.lock("Here comes the walrus", shipit_users(:walrus))
-      old_time = @stack.locked_since
-
-      new_reason = "Its still coming!"
-      @stack.lock(new_reason, shipit_users(:walrus))
-
-      assert @stack.locked?
-      assert_equal new_reason, @stack.lock_reason
-      assert_equal old_time, @stack.locked_since
-    end
-
     test "stack contains valid deploy_url" do
       @stack.deploy_url = "Javascript:alert(0);//"
       assert_not_predicate @stack, :valid?

data/test/models/status/group_test.rb

@@ -24,6 +24,12 @@ module Shipit
       assert_equal 'failure', @group.state
     end
 
+    test "#blocking? returns true if any of the status is blocking" do
+      blocking_status = shipit_statuses(:soc_first)
+      assert_predicate blocking_status, :blocking?
+      Status::Group.new(blocking_status.commit, [blocking_status])
+    end
+
     test ".compact returns a regular status if there is only one visible status" do
       status = Status::Group.compact(@commit, @commit.statuses.where(context: 'ci/travis'))
       assert_instance_of Status, status

data/test/models/undeployed_commits_test.rb

@@ -68,6 +68,15 @@ module Shipit
       assert_equal 'failure', @commit.deploy_state(true)
     end
 
+    test "#deploy_state returns `blocked` if a previous commit is blocking" do
+      blocking_commit = shipit_commits(:soc_second)
+      blocking_commit.statuses.delete_all
+      assert_predicate blocking_commit, :blocking?
+
+      commit = UndeployedCommit.new(shipit_commits(:soc_third), 0)
+      assert_equal 'blocked', commit.deploy_state
+    end
+
     test "#redeploy_state returns `allowed` by default" do
       assert_equal 'allowed', @commit.redeploy_state
     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('walrus').returns(@github_user)
+      Shipit.github_api.expects(:user).with(@user.github_id).returns(@github_user)
       @user.refresh_from_github!
       @user.reload
 
@@ -82,7 +82,7 @@ module Shipit
       user.update!(github_id: @github_user.id)
       commit = user.authored_commits.last
 
-      Shipit.github_api.expects(:user).with(user.login).raises(Octokit::NotFound)
+      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

data/test/test_helper.rb

@@ -49,7 +49,7 @@ class ActiveSupport::TestCase
   teardown do
     Shipit.redis.flushdb
     Shipit.instance_variable_names.each do |name|
-      next if name == "@mocha" || name == "@redis"
+      next if %w(@mocha @redis).include?(name)
       Shipit.remove_instance_variable(name)
     end
   end