shipit-engine 0.11.0 → 0.12.0

data/test/controllers/stacks_controller_test.rb

@@ -11,7 +11,6 @@ module Shipit
     test "validates that Shipit.github_oauth_id is present" do
       Shipit.stubs(github_oauth_credentials: {'secret' => 'abc'})
       get :index
-      assert_template 'missing_settings'
       assert_select "#github_oauth_id .missing"
       assert_select ".missing", count: 1
     end
@@ -19,7 +18,6 @@ module Shipit
     test "validates that Shipit.github_oauth_secret is present" do
       Shipit.stubs(github_oauth_credentials: {'id' => 'abc'})
       get :index
-      assert_template 'missing_settings'
       assert_select "#github_oauth_secret .missing"
       assert_select ".missing", count: 1
     end
@@ -27,7 +25,6 @@ module Shipit
     test "validates that Shipit.github_api_credentials is present" do
       Shipit.stubs(github_api_credentials: {})
       get :index
-      assert_template 'missing_settings'
       assert_select "#github_api .missing"
       assert_select ".missing", count: 1
     end
@@ -35,7 +32,6 @@ module Shipit
     test "validates that Shipit.redis_url is present" do
       Shipit.stubs(redis_url: nil)
       get :index
-      assert_template 'missing_settings'
       assert_select "#redis_url .missing"
       assert_select ".missing", count: 1
     end
@@ -43,7 +39,6 @@ module Shipit
     test "validates that Shipit.host is present" do
       Shipit.stubs(host: nil)
       get :index
-      assert_template 'missing_settings'
       assert_select "#host .missing"
       assert_select ".missing", count: 1
     end
@@ -66,33 +61,32 @@ module Shipit
     end
 
     test "#show is success" do
-      get :show, id: @stack.to_param
+      get :show, params: {id: @stack.to_param}
       assert_response :ok
     end
 
     test "#show handles locked stacks without a lock_author" do
       @stack.update!(lock_reason: "I am a lock with no author")
-      get :show, id: @stack.to_param
+      get :show, params: {id: @stack.to_param}
     end
 
     test "#show auto-links URLs in lock reason" do
       @stack.update!(lock_reason: 'http://google.com')
-      get :show, id: @stack.to_param
+      get :show, params: {id: @stack.to_param}
       assert_response :ok
       assert_select 'a[href="http://google.com"]'
     end
 
     test "#create creates a Stack, queues a job to setup webhooks and redirects to it" do
-      params = {}
-      params[:stack] = {
-        repo_name: "rails",
-        repo_owner: "rails",
-        environment: "staging",
-        branch: "staging",
-      }
-
       assert_difference "Stack.count" do
-        post :create, params
+        post :create, params: {
+          stack: {
+            repo_name: 'rails',
+            repo_owner: 'rails',
+            environment: 'staging',
+            branch: 'staging',
+          },
+        }
       end
 
       assert_redirected_to stack_path(Stack.last)
@@ -100,28 +94,27 @@ module Shipit
 
     test "#create when not valid renders new" do
       assert_no_difference "Stack.count" do
-        post :create, stack: {repo_owner: 'some', repo_name: 'owner/path'}
+        post :create, params: {stack: {repo_owner: 'some', repo_name: 'owner/path'}}
       end
-
-      assert_template :new
+      assert_response :success
     end
 
     test "#destroy enqueues a DestroyStackJob" do
       assert_enqueued_with(job: DestroyStackJob, args: [@stack]) do
-        delete :destroy, id: @stack.to_param
+        delete :destroy, params: {id: @stack.to_param}
       end
       assert_redirected_to stacks_path
     end
 
     test "#settings is success" do
-      get :settings, id: @stack.to_param
+      get :settings, params: {id: @stack.to_param}
       assert_response :success
     end
 
     test "#update allows to lock the stack" do
       refute @stack.locked?
 
-      patch :update, id: @stack.to_param, stack: {lock_reason: 'Went out to eat some chips!'}
+      patch :update, params: {id: @stack.to_param, stack: {lock_reason: 'Went out to eat some chips!'}}
       @stack.reload
       assert @stack.locked?
       assert_equal shipit_users(:walrus), @stack.lock_author
@@ -131,7 +124,7 @@ module Shipit
       @stack.update!(lock_reason: 'Went out to eat some chips!')
       assert @stack.locked?
 
-      patch :update, id: @stack.to_param, stack: {lock_reason: ''}
+      patch :update, params: {id: @stack.to_param, stack: {lock_reason: ''}}
       @stack.reload
       refute @stack.locked?
       assert_instance_of AnonymousUser, @stack.lock_author
@@ -142,7 +135,7 @@ module Shipit
 
       assert_enqueued_with(job: RefreshStatusesJob, args: [stack_id: @stack.id]) do
         assert_enqueued_with(job: GithubSyncJob, args: [stack_id: @stack.id]) do
-          post :refresh, id: @stack.to_param
+          post :refresh, params: {id: @stack.to_param}
         end
       end
 
@@ -151,26 +144,40 @@ module Shipit
 
     test "#sync_webhooks queues #{Stack::REQUIRED_HOOKS.count} SetupGithubHookJob" do
       assert_enqueued_jobs(Stack::REQUIRED_HOOKS.count) do
-        post :sync_webhooks, id: @stack.to_param
+        post :sync_webhooks, params: {id: @stack.to_param}
       end
       assert_redirected_to stack_settings_path(@stack)
     end
 
     test "#clear_git_cache queues a ClearGitCacheJob" do
       assert_enqueued_with(job: ClearGitCacheJob, args: [@stack]) do
-        post :clear_git_cache, id: @stack.to_param
+        post :clear_git_cache, params: {id: @stack.to_param}
       end
       assert_redirected_to stack_settings_path(@stack)
     end
 
     test "#update redirects to return_to parameter" do
-      patch :update, id: @stack.to_param, stack: {ignore_ci: false}, return_to: stack_path(@stack)
+      patch :update, params: {id: @stack.to_param, stack: {ignore_ci: false}, return_to: stack_path(@stack)}
       assert_redirected_to stack_path(@stack)
     end
 
     test "#lookup redirects to the canonical URL" do
-      get :lookup, id: @stack.id
+      get :lookup, params: {id: @stack.id}
       assert_redirected_to stack_path(@stack)
     end
+
+    test "#create does not create stack with invalid deploy_url" do
+      post :create, params: {
+        stack: {
+          repo_name: 'rails',
+          repo_owner: 'rails',
+          environment: 'staging',
+          branch: 'staging',
+          deploy_url: 'Javascript:alert(1);',
+        },
+      }
+      assert_response :success
+      assert_equal 'Deploy url is invalid', flash[:warning]
+    end
   end
 end

data/test/controllers/tasks_controller_test.rb

@@ -11,14 +11,14 @@ module Shipit
     end
 
     test "tasks defined in the shipit.yml can be displayed" do
-      get :new, stack_id: @stack, definition_id: @definition.id
+      get :new, params: {stack_id: @stack, definition_id: @definition.id}
       assert_response :ok
     end
 
     test "tasks defined in the shipit.yml can't be triggered if the stack is being deployed" do
       assert @stack.active_task?
       assert_no_difference -> { @stack.tasks.count } do
-        post :create, stack_id: @stack, definition_id: @definition.id
+        post :create, params: {stack_id: @stack, definition_id: @definition.id}
       end
       assert_redirected_to new_stack_tasks_path(@stack, @definition)
     end
@@ -26,7 +26,7 @@ module Shipit
     test "tasks defined in the shipit.yml can be triggered anyway if force apram is present" do
       assert @stack.active_task?
       assert_difference -> { @stack.tasks.count } do
-        post :create, stack_id: @stack, definition_id: @definition.id, force: 'true'
+        post :create, params: {stack_id: @stack, definition_id: @definition.id, force: 'true'}
       end
       assert_redirected_to stack_task_path(@stack, Task.last)
     end
@@ -34,7 +34,7 @@ module Shipit
     test "tasks defined in the shipit.yml can be triggered while the stack is being deployed if specified as such" do
       @definition = @stack.find_task_definition('flush_cache')
       assert_difference -> { @stack.tasks.count } do
-        post :create, stack_id: @stack, definition_id: @definition.id
+        post :create, params: {stack_id: @stack, definition_id: @definition.id}
       end
       assert_redirected_to stack_task_path(@stack, Task.last)
     end
@@ -42,18 +42,18 @@ module Shipit
     test "tasks with variables defined in the shipit.yml can be triggered with their variables set" do
       env = {"FOO" => "0"}
 
-      post :create, stack_id: @stack, definition_id: @definition.id, task: {env: env}, force: 'true'
+      post :create, params: {stack_id: @stack, definition_id: @definition.id, task: {env: env}, force: 'true'}
 
       assert_redirected_to stack_tasks_path(@stack, Task.last)
     end
 
     test "triggered tasks can be observed" do
-      get :show, stack_id: @stack, id: @task.id
+      get :show, params: {stack_id: @stack, id: @task.id}
       assert_response :ok
     end
 
     test "triggered tasks can be observed as raw text" do
-      get :show, stack_id: @stack, id: @task.id, format: "txt"
+      get :show, params: {stack_id: @stack, id: @task.id}, format: 'txt'
       assert_response :success
       assert_equal("text/plain", @response.content_type)
     end
@@ -61,7 +61,7 @@ module Shipit
     test ":abort call abort! on the deploy" do
       @task = shipit_deploys(:shipit_running)
       @task.ping
-      post :abort, stack_id: @stack.to_param, id: @task.id
+      post :abort, params: {stack_id: @stack.to_param, id: @task.id}
 
       @task.reload
       assert_response :success
@@ -72,7 +72,7 @@ module Shipit
     test ":abort schedule the rollback if `rollback` is present" do
       @task = shipit_deploys(:shipit_running)
       @task.ping
-      post :abort, stack_id: @stack.to_param, id: @task.id, rollback: 'true'
+      post :abort, params: {stack_id: @stack.to_param, id: @task.id, rollback: 'true'}
 
       @task.reload
       assert_response :success
@@ -81,13 +81,13 @@ module Shipit
     end
 
     test ":index list the stack deploys" do
-      get :index, stack_id: @stack.to_param
+      get :index, params: {stack_id: @stack.to_param}
       assert_response :success
       assert_select '.task-list .task', @stack.tasks.count
     end
 
     test ":index paginates with the `since` parameter" do
-      get :index, stack_id: @stack.to_param, since: @stack.tasks.last.id
+      get :index, params: {stack_id: @stack.to_param, since: @stack.tasks.last.id}
       assert_response :success
       assert_select '.task-list .task', @stack.tasks.count - 1
     end
@@ -96,7 +96,7 @@ module Shipit
       @task = shipit_deploys(:shipit_running)
       last_chunk = @task.chunks.last
 
-      get :tail, stack_id: @stack.to_param, id: @task.id, last_id: last_chunk.id, format: :json
+      get :tail, params: {stack_id: @stack.to_param, id: @task.id, last_id: last_chunk.id}, format: :json
       assert_response :success
       assert_json_keys %w(url status output)
       assert_json 'status', @task.status
@@ -105,7 +105,7 @@ module Shipit
     test ":tail doesn't returns the next url if the task is finished" do
       @task = shipit_deploys(:shipit)
 
-      get :tail, stack_id: @stack.to_param, id: @task.id, format: :json
+      get :tail, params: {stack_id: @stack.to_param, id: @task.id}, format: :json
       assert_response :success
       assert_no_json 'url'
     end
@@ -113,7 +113,7 @@ module Shipit
     test ":tail returns the rollback url if the task have been aborted" do
       @task = shipit_deploys(:shipit_aborted)
 
-      get :tail, stack_id: @stack.to_param, id: @task.id, format: :json
+      get :tail, params: {stack_id: @stack.to_param, id: @task.id}, format: :json
       assert_response :success
       assert_json_keys %w(status output rollback_url)
     end

data/test/controllers/webhooks_controller_test.rb

@@ -12,16 +12,7 @@ module Shipit
       params = payload(:push_master)
 
       assert_enqueued_with(job: GithubSyncJob, args: [stack_id: @stack.id]) do
-        post :push, {stack_id: @stack.id}.merge(params)
-      end
-    end
-
-    test ":push with the target branch queues a GitMirrorUpdateJob" do
-      request.headers['X-Github-Event'] = 'push'
-      params = payload(:push_master)
-
-      assert_enqueued_with(job: GitMirrorUpdateJob, args: [@stack]) do
-        post :push, {stack_id: @stack.id}.merge(params)
+        post :push, params: {stack_id: @stack.id}.merge(params)
       end
     end
 
@@ -29,7 +20,7 @@ module Shipit
       request.headers['X-Github-Event'] = 'push'
       params = payload(:push_not_master)
       assert_no_enqueued_jobs do
-        post :push, {stack_id: @stack.id}.merge(params)
+        post :push, params: {stack_id: @stack.id}.merge(params)
       end
     end
 
@@ -40,7 +31,7 @@ module Shipit
       commit = shipit_commits(:first)
 
       assert_difference 'commit.statuses.count', 1 do
-        post :state, {stack_id: @stack.id}.merge(status_payload)
+        post :state, params: {stack_id: @stack.id}.merge(status_payload)
       end
 
       status = commit.statuses.last
@@ -55,14 +46,14 @@ module Shipit
       request.headers['X-Github-Event'] = 'status'
       params = {'sha' => 'notarealcommit', 'state' => 'pending', 'branches' => [{'name' => 'master'}]}
       assert_raises ActiveRecord::RecordNotFound do
-        post :state, {stack_id: @stack.id}.merge(params)
+        post :state, params: {stack_id: @stack.id}.merge(params)
       end
     end
 
     test ":state in an untracked branche bails out" do
       request.headers['X-Github-Event'] = 'status'
       params = {'sha' => 'notarealcommit', 'state' => 'pending', 'branches' => []}
-      post :state, {stack_id: @stack.id}.merge(params)
+      post :state, params: {stack_id: @stack.id}.merge(params)
       assert_response :ok
     end
 
@@ -70,7 +61,7 @@ module Shipit
       @request.headers['X-Github-Event'] = 'ping'
 
       assert_no_enqueued_jobs do
-        post :state, stack_id: @stack.id, zen: "Git is beautiful"
+        post :state, params: {stack_id: @stack.id, zen: 'Git is beautiful'}
         assert_response :ok
       end
     end
@@ -79,7 +70,7 @@ module Shipit
       @request.headers['X-Github-Event'] = 'ping'
 
       assert_no_enqueued_jobs do
-        post :state, stack_id: @stack.id
+        post :state, params: {stack_id: @stack.id}
         assert_response :ok
       end
     end
@@ -95,7 +86,7 @@ module Shipit
 
       GithubHook.any_instance.expects(:verify_signature).with(signature, URI.encode_www_form(params)).returns(false)
 
-      post :push, {stack_id: @stack.id}.merge(params)
+      post :push, params: {stack_id: @stack.id}.merge(params)
       assert_response :unprocessable_entity
     end
 
@@ -108,13 +99,13 @@ module Shipit
 
       GithubHook.any_instance.expects(:verify_signature).with(signature, URI.encode_www_form(params)).returns(false)
 
-      post :push, {stack_id: @stack.id}.merge(params)
+      post :push, params: {stack_id: @stack.id}.merge(params)
       assert_response :unprocessable_entity
     end
 
     test ":membership creates the mentioned team on the fly" do
       assert_difference -> { Team.count }, 1 do
-        post :membership, membership_params.merge(team: {
+        post :membership, params: membership_params.merge(team: {
           id: 48,
           name: 'Ouiche Cooks',
           slug: 'ouiche-cooks',
@@ -127,42 +118,42 @@ module Shipit
     test ":membership creates the mentioned user on the fly" do
       Shipit.github_api.expects(:user).with('george').returns(george)
       assert_difference -> { User.count }, 1 do
-        post :membership, membership_params.merge(member: {login: 'george'})
+        post :membership, params: membership_params.merge(member: {login: 'george'})
         assert_response :ok
       end
     end
 
     test ":membership can delete an user membership" do
       assert_difference -> { Membership.count }, -1 do
-        post :membership, membership_params.merge(_action: 'removed')
+        post :membership, params: membership_params.merge(_action: 'removed')
         assert_response :ok
       end
     end
 
     test ":membership can append an user membership" do
       assert_difference -> { Membership.count }, 1 do
-        post :membership, membership_params.merge(member: {login: 'bob'})
+        post :membership, params: membership_params.merge(member: {login: 'bob'})
         assert_response :ok
       end
     end
 
     test ":membership can append an user twice" do
       assert_no_difference -> { Membership.count } do
-        post :membership, membership_params
+        post :membership, params: membership_params
         assert_response :ok
       end
     end
 
     test ":membership can delete an user twice" do
       assert_no_difference -> { Membership.count } do
-        post :membership, membership_params.merge(_action: 'removed', member: {login: 'bob'})
+        post :membership, params: membership_params.merge(_action: 'removed', member: {login: 'bob'})
         assert_response :ok
       end
     end
 
     test ":membership can append a user membership for an organization with capitals" do
       assert_difference -> { Membership.count }, 1 do
-        post :membership, membership_params.merge(organization: {login: 'Shopify'}, member: {login: 'bob'})
+        post :membership, params: membership_params.merge(organization: {login: 'Shopify'}, member: {login: 'bob'})
         assert_response :ok
       end
     end

data/test/dummy/config/application.rb

@@ -23,9 +23,6 @@ module Shipit
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
-
-    # Do not swallow errors in after_commit/after_rollback callbacks.
-    config.active_record.raise_in_transactional_callbacks = true
   end
 end
 

data/test/dummy/config/environments/test.rb

@@ -13,8 +13,8 @@ Rails.application.configure do
   config.eager_load = true
 
   # Configure static file server for tests with Cache-Control for performance.
-  config.serve_static_files   = true
-  config.static_cache_control = 'public, max-age=3600'
+  config.public_file_server.enabled = true
+  config.public_file_server.headers = {'Cache-Control' => 'public, max-age=3600'}
 
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true