shipit-engine 0.27.1 → 0.28.0

data/test/controllers/api/stacks_controller_test.rb

@@ -107,6 +107,25 @@ module Shipit
         assert_response :ok
         assert_json 'last_deployed_at', @stack.last_deployed_at
       end
+
+      test "#destroy schedules stack deletion job" do
+        assert_enqueued_with(job: DestroyStackJob) do
+          delete :destroy, params: {id: @stack.to_param}
+        end
+        assert_response :accepted
+      end
+
+      test "#destroy fails with insufficient permissions" do
+        @client.permissions.delete('write:stack')
+        @client.save!
+
+        assert_no_difference 'Stack.count' do
+          delete :destroy, params: {id: @stack.to_param}
+        end
+
+        assert_response :forbidden
+        assert_json 'message', 'This operation requires the `write:stack` permission'
+      end
     end
   end
 end

data/test/controllers/commits_controller_test.rb

@@ -5,14 +5,38 @@ module Shipit
     setup do
       @stack = shipit_stacks(:shipit)
       @commit = shipit_commits(:first)
-      session[:user_id] = shipit_users(:walrus).id
+      @user = shipit_users(:walrus)
+      session[:user_id] = @user.id
     end
 
-    test "#update allows to lock a commit" do
-      refute_predicate @commit, :locked?
-      patch :update, params: {stack_id: @stack.to_param, id: @commit.id, commit: {locked: true}}
-      assert_response :ok
-      assert_predicate @commit.reload, :locked?
+    test "#update allows commits to be locked and sets the lock author" do
+      refute_predicate(@commit, :locked?)
+
+      patch(:update, params: {
+        stack_id: @stack.to_param,
+        id: @commit.id,
+        commit: {locked: true},
+      })
+
+      assert_response(:ok)
+      @commit.reload
+      assert_predicate(@commit, :locked?)
+      assert_equal(@user, @commit.lock_author)
+    end
+
+    test "#update allows commits to be unlocked and clears the lock author" do
+      @commit.lock(@user)
+
+      patch(:update, params: {
+        stack_id: @stack.to_param,
+        id: @commit.id,
+        commit: {locked: false},
+      })
+
+      assert_response(:ok)
+      @commit.reload
+      refute_predicate(@commit, :locked?)
+      assert_nil(@commit.lock_author_id)
     end
   end
 end

data/test/controllers/deploys_controller_test.rb

@@ -7,11 +7,12 @@ module Shipit
       @stack = shipit_stacks(:shipit)
       @deploy = shipit_deploys(:shipit)
       @commit = shipit_commits(:second)
-      session[:user_id] = shipit_users(:walrus).id
+      @user = shipit_users(:walrus)
+      session[:user_id] = @user.id
     end
 
     test ":show is success" do
-      get :show, params: {stack_id: @stack.to_param, id: @deploy.id}
+      get :show, params: {stack_id: @stack.to_param, id: @stack.deploys.last.id}
       assert_response :success
     end
 
@@ -100,6 +101,54 @@ module Shipit
       assert_select '#new_rollback #force', 1
     end
 
+    test ":rollback button shows deploy and commit ids" do
+      previous_deploy = @stack.deploys.second_to_last
+      previous_deploy.status = "success"
+      previous_deploy.type = "Shipit::Deploy"
+      previous_deploy.since_commit_id = 1
+      previous_deploy.until_commit_id = 2
+      previous_deploy.save
+
+      latest_deploy = @stack.deploys.last
+      latest_deploy.status = "running"
+      latest_deploy.type = "Shipit::Deploy"
+      latest_deploy.since_commit_id = 3
+      latest_deploy.until_commit_id = 4
+      latest_deploy.save
+
+      rollback_commit = @stack.commits.where(id: 2).first
+
+      get :show, params: {stack_id: @stack, id: latest_deploy.id, format: 'html'}
+
+      expected_result = "Abort and Rollback to <span class=\"short-sha-no-bg\">#{rollback_commit.short_sha}</span>"
+      expected_rolling_back_element = "Aborting with Rollback... to <span class=\"short-sha-no-bg\">#{rollback_commit.short_sha}</span>"
+
+      assert_select 'span.caption--ready', {html: expected_result}, "rollback button element was not found, or did not match the expected result of '#{expected_result}'"
+      assert_select 'span.caption--pending', {html: expected_rolling_back_element}, "ready rollback button element was not found, or did not match the expected result of '#{expected_rolling_back_element}'"
+    end
+
+    test ":rollback (regression) works correctly when a previous deploy is not found" do
+      rollback_commit_id = 3
+      latest_deploy = @stack.deploys.last
+      latest_deploy.status = "running"
+      latest_deploy.type = "Shipit::Deploy"
+      latest_deploy.since_commit_id = rollback_commit_id
+      latest_deploy.until_commit_id = 4
+      latest_deploy.save
+
+      @stack.deploys.where.not(id: latest_deploy.id).delete_all
+
+      rollback_commit = @stack.commits.where(id: rollback_commit_id).take
+
+      get :show, params: {stack_id: @stack, id: latest_deploy.id, format: 'html'}
+
+      expected_result = "Abort and Rollback to <span class=\"short-sha-no-bg\">#{rollback_commit.short_sha}</span>"
+      expected_rolling_back_element = "Aborting with Rollback... to <span class=\"short-sha-no-bg\">#{rollback_commit.short_sha}</span>"
+
+      assert_select 'span.caption--ready', {html: expected_result}, "rollback button element was not found, or did not match the expected result of '#{expected_result}'"
+      assert_select 'span.caption--pending', {html: expected_rolling_back_element}, "ready rollback button element was not found, or did not match the expected result of '#{expected_rolling_back_element}'"
+    end
+
     test ":revert redirect to the proper rollback page" do
       get :revert, params: {stack_id: @stack.to_param, id: shipit_deploys(:shipit2).id}
       assert_redirected_to rollback_stack_deploy_path(@stack, shipit_deploys(:shipit))

data/test/controllers/tasks_controller_test.rb

@@ -123,5 +123,29 @@ module Shipit
       assert_response :success
       assert_json_keys %w(status output rollback_url)
     end
+
+    test ":lookup returns stack task url if the task is an instance of Task" do
+      @task = shipit_tasks(:shipit_restart)
+
+      get :lookup, params: {id: @task.id}
+
+      assert_redirected_to stack_task_path(@task.stack, @task)
+    end
+
+    test ":lookup returns stack deploy url if the task is an instance of Deploy" do
+      @task = shipit_tasks(:shipit)
+
+      get :lookup, params: {id: @task.id}
+
+      assert_redirected_to stack_deploy_path(@task.stack, @task)
+    end
+
+    test ":lookup returns stack deploy url if the task is an instance of Rollback" do
+      @task = shipit_tasks(:shipit_rollback)
+
+      get :lookup, params: {id: @task.id}
+
+      assert_redirected_to stack_deploy_path(@task.stack, @task)
+    end
   end
 end

data/test/dummy/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2018_10_10_150947) do
+ActiveRecord::Schema.define(version: 2019_05_02_020249) do
 
   create_table "api_clients", force: :cascade do |t|
     t.text "permissions", limit: 65535
@@ -76,6 +76,7 @@ ActiveRecord::Schema.define(version: 2018_10_10_150947) do
     t.string "pull_request_title", limit: 1024
     t.integer "pull_request_id"
     t.boolean "locked", default: false, null: false
+    t.integer "lock_author_id", limit: 4
     t.index ["author_id"], name: "index_commits_on_author_id"
     t.index ["committer_id"], name: "index_commits_on_committer_id"
     t.index ["created_at"], name: "index_commits_on_created_at"

data/test/dummy/db/seeds.rb

@@ -9,6 +9,8 @@ module Shipit
   Stack.send(:define_method, :sync_github) {}
   Commit.send(:define_method, :fetch_stats!) {}
   Commit.send(:define_method, :refresh_statuses!) {}
+  Commit.send(:define_method, :refresh_check_runs!) {}
+  ReleaseStatus.send(:define_method, :create_status_on_github!) {}
 
   users = 3.times.map do
     User.create!(

data/test/fixtures/shipit/check_runs.yml

@@ -9,6 +9,17 @@ second_pending_travis:
   details_url: "http://www.example.com/build/424242"
   created_at: <%= 10.days.ago.to_s(:db) %>
 
+check_runs_first_pending_coveralls:
+  stack: check_runs
+  commit_id: 201 # check_runs_first
+  github_id: 43
+  title: lets go
+  name: Coverage metrics
+  created_at: <%= 10.days.ago.to_s(:db) %>
+  conclusion: pending
+  html_url: "http://www.example.com/run/434343"
+  details_url: "http://www.example.com/build/434343"
+
 check_runs_first_success_coveralls:
   stack: check_runs
   commit_id: 201 # check_runs_first

data/test/fixtures/shipit/commits.yml

@@ -246,3 +246,107 @@ canaries_fifth:
   additions: 1
   deletions: 24
   updated_at: <%= 8.days.ago.to_s(:db) %>
+
+undeployed_1:
+  id: 401
+  sha: 4d9278037b872fd9a6690523e411ecb3aa181355
+  message: "lets go"
+  stack: shipit_undeployed
+  author: walrus
+  committer: walrus
+  authored_at: <%= 10.days.ago.to_s(:db) %>
+  committed_at: <%= 9.days.ago.to_s(:db) %>
+  additions: 42
+  deletions: 24
+  updated_at: <%= 8.days.ago.to_s(:db) %>
+
+undeployed_2:
+  id: 402
+  sha: 4890fd8b5f2be05d1fedb763a3605ee461c39074
+  message: "sheep it!"
+  stack: shipit_undeployed
+  author: walrus
+  committer: walrus
+  authored_at: <%= 8.days.ago.to_s(:db) %>
+  committed_at: <%= 7.days.ago.to_s(:db) %>
+  additions: 1
+  deletions: 1
+  updated_at: <%= 8.days.ago.to_s(:db) %>
+
+undeployed_3:
+  id: 403
+  sha: 467578b362bf2b4df5903e1c7960929361c39074
+  message: "fix it!"
+  stack: shipit_undeployed
+  author: walrus
+  committer: walrus
+  authored_at: <%= 6.days.ago.to_s(:db) %>
+  committed_at: <%= 5.days.ago.to_s(:db) %>
+  additions: 12
+  deletions: 64
+  updated_at: <%= 8.days.ago.to_s(:db) %>
+
+undeployed_4:
+  id: 404
+  sha: 447578b362bf2b4df5903e1c7960929361c3435a
+  message: "Merge pull request #7 from shipit-engine/yoloshipit\n\nyoloshipit!"
+  stack: shipit_undeployed
+  author: walrus
+  committer: walrus
+  authored_at: <%= 4.days.ago.to_s(:db) %>
+  committed_at: <%= 3.days.ago.to_s(:db) %>
+  additions: 420
+  deletions: 342
+  updated_at: <%= 8.days.ago.to_s(:db) %>
+
+undeployed_5:
+  id: 405
+  sha: 457578b362bf2b4df5903e1c7960929361c3435a
+  message: "Merge pull request #7 from shipit-engine/yoloshipit\n\nyoloshipit!"
+  stack: shipit_undeployed
+  author: walrus
+  committer: walrus
+  authored_at: <%= 4.days.ago.to_s(:db) %>
+  committed_at: <%= 3.days.ago.to_s(:db) %>
+  additions: 420
+  deletions: 342
+  updated_at: <%= 8.days.ago.to_s(:db) %>
+
+undeployed_6:
+  id: 406
+  sha: 467578b362bf2b4df5903e1c7960929361c3435a
+  message: "Merge pull request #7 from shipit-engine/yoloshipit\n\nyoloshipit!"
+  stack: shipit_undeployed
+  author: walrus
+  committer: walrus
+  authored_at: <%= 4.days.ago.to_s(:db) %>
+  committed_at: <%= 3.days.ago.to_s(:db) %>
+  additions: 420
+  deletions: 342
+  updated_at: <%= 8.days.ago.to_s(:db) %>
+
+undeployed_7:
+  id: 407
+  sha: 477578b362bf2b4df5903e1c7960929361c3435a
+  message: "Merge pull request #7 from shipit-engine/yoloshipit\n\nyoloshipit!"
+  stack: shipit_undeployed
+  author: walrus
+  committer: walrus
+  authored_at: <%= 4.days.ago.to_s(:db) %>
+  committed_at: <%= 3.days.ago.to_s(:db) %>
+  additions: 420
+  deletions: 342
+  updated_at: <%= 8.days.ago.to_s(:db) %>
+
+single:
+  id: 501
+  sha: 547578b362bf2b4df5903e1c7960929361c3435a
+  message: "first commit"
+  stack: shipit_single
+  author: walrus
+  committer: walrus
+  authored_at: <%= 4.days.ago.to_s(:db) %>
+  committed_at: <%= 3.days.ago.to_s(:db) %>
+  additions: 420
+  deletions: 342
+  updated_at: <%= 8.days.ago.to_s(:db) %>

data/test/fixtures/shipit/stacks.yml

@@ -5,8 +5,8 @@ shipit:
   branch: master
   ignore_ci: false
   merge_queue_enabled: true
-  tasks_count: 3
-  undeployed_commits_count: 1
+  tasks_count: 8
+  undeployed_commits_count: 2
   cached_deploy_spec: >
     {
       "machine": {"environment": {}},
@@ -62,6 +62,7 @@ shipit_canaries:
   merge_queue_enabled: true
   tasks_count: 3
   undeployed_commits_count: 1
+  continuous_deployment: true
   cached_deploy_spec: >
     {
       "machine": {"environment": {}},
@@ -224,4 +225,98 @@ check_runs:
   environment: production
   branch: master
   tasks_count: 0
-  undeployed_commits_count: 1
+  undeployed_commits_count: 1
+
+shipit_undeployed:
+  repo_owner: "shopify"
+  repo_name: "shipit-engine"
+  environment: "undeployed"
+  branch: master
+  ignore_ci: true
+  merge_queue_enabled: true
+  tasks_count: 2
+  undeployed_commits_count: 6
+  continuous_deployment: true
+  cached_deploy_spec: >
+    {
+      "machine": {"environment": {}},
+      "review": {
+        "checklist": ["foo", "bar", "baz"],
+        "monitoring": [
+          {"image": "https://example.com/monitor.png", "width": 200, "height": 300}
+        ]
+      },
+      "dependencies": {"override": []},
+      "deploy": {"override": null, "interval": 60, "max_commits": 3, "variables": [{"name": "SAFETY_DISABLED", "title": "Set to 1 to do dangerous things", "default": 0}]},
+      "rollback": {"override": ["echo 'Rollback!'"]},
+      "fetch": ["echo '42'"],
+      "tasks": {
+        "restart": {
+          "action": "Restart application",
+          "description": "Restart app and job servers",
+          "variables": [
+            {"name": "FOO", "title": "Set to 0 to foo", "default": 1},
+            {"name": "BAR", "title": "Set to 1 to bar", "default": 0},
+            {"name": "WALRUS", "title": "Walrus without a default value"}
+          ],
+          "steps": [
+            "cap $ENVIRONMENT deploy:restart"
+          ]
+        },
+        "flush_cache": {
+          "action": "Flush cache",
+          "description": "Flush the application cache",
+          "steps": [
+            "cap $ENVIRONMENT cache:flush"
+          ],
+          "allow_concurrency": true
+        }
+      },
+      "merge": {
+        "revalidate_after": 900
+      },
+      "ci": {
+        "hide": ["ci/hidden"],
+        "allow_failures": ["ci/ok_to_fail"]
+      }
+    }
+  last_deployed_at: <%= 8.days.ago.to_s(:db) %>
+  updated_at: <%= 8.days.ago.to_s(:db) %>
+
+shipit_single:
+  repo_owner: "shopify"
+  repo_name: "shipit-engine"
+  environment: "single"
+  branch: master
+  ignore_ci: false
+  merge_queue_enabled: true
+  tasks_count: 2
+  undeployed_commits_count: 1
+  cached_deploy_spec: >
+    {
+      "machine": {"environment": {}},
+      "review": {
+        "checklist": ["foo", "bar", "baz"],
+        "monitoring": [
+          {"image": "https://example.com/monitor.png", "width": 200, "height": 300}
+        ]
+      },
+      "dependencies": {"override": []},
+      "deploy": {"override": null},
+      "rollback": {"override": ["echo 'Rollback!'"]},
+      "fetch": ["echo '42'"],
+      "tasks": {
+        "restart": {
+          "action": "Restart application",
+          "description": "Restart app and job servers",
+          "steps": [
+            "cap $ENVIRONMENT deploy:restart"
+          ]
+        }
+      },
+      "ci": {
+        "blocking": ["soc/compliance"]
+      }
+    }
+  updated_at: <%= 8.days.ago.to_s(:db) %>
+  last_deployed_at: <%= 8.days.ago.to_s(:db) %>

data/test/fixtures/shipit/tasks.yml

@@ -236,3 +236,45 @@ shipit_with_title_parsing_issue:
   created_at: <%= (60 - 3).minutes.ago.to_s(:db) %>
   started_at: <%= (60 - 3).minutes.ago.to_s(:db) %>
   ended_at: <%= (60 - 4).minutes.ago.to_s(:db) %>
+
+shipit_undeployed_1:
+  id: 201
+  user: walrus
+  since_commit_id: 401
+  until_commit_id: 401
+  type: Shipit::Deploy
+  stack: shipit_undeployed
+  status: success
+  additions: 1
+  deletions: 1
+  created_at: <%= (60 - 1).minutes.ago.to_s(:db) %>
+  started_at: <%= (60 - 1).minutes.ago.to_s(:db) %>
+  ended_at: <%= (60 - 3).minutes.ago.to_s(:db) %>
+
+shipit_undeployed_2:
+  id: 202
+  user: walrus
+  since_commit_id: 402
+  until_commit_id: 403
+  type: Shipit::Deploy
+  stack: shipit_undeployed
+  status: running
+  additions: 12
+  deletions: 64
+  created_at: <%= (60 - 2).minutes.ago.to_s(:db) %>
+  started_at: <%= (60 - 2).minutes.ago.to_s(:db) %>
+  ended_at: <%= (60 - 4).minutes.ago.to_s(:db) %>
+
+shipit_single:
+  id: 301
+  user: walrus
+  since_commit_id: 501
+  until_commit_id: 501
+  type: Shipit::Deploy
+  stack: shipit_single
+  status: running
+  additions: 12
+  deletions: 64
+  created_at: <%= (60 - 2).minutes.ago.to_s(:db) %>
+  started_at: <%= (60 - 2).minutes.ago.to_s(:db) %>
+  ended_at: <%= (60 - 4).minutes.ago.to_s(:db) %>