Fix ci commits features specs

4 files changed, 23 insertions, 8 deletions

diff --git a/app/assets/stylesheets/ci/sections/builds.scss b/app/assets/stylesheets/ci/sections/builds.scss
index a9d39bb0cbd..600919635d0 100644
--- a/app/assets/stylesheets/ci/sections/builds.scss
+++ b/app/assets/stylesheets/ci/sections/builds.scss
@@ -52,3 +52,11 @@ pre.trace {
     color: #777;
   }
 }
+
+.alert-disabled {
+  background: #EEE;
+
+  a {
+    color: #3084bb !important;
+  }
+}
diff --git a/app/controllers/ci/commits_controller.rb b/app/controllers/ci/commits_controller.rb
index bad9075dde6..0f7f5485661 100644
--- a/app/controllers/ci/commits_controller.rb
+++ b/app/controllers/ci/commits_controller.rb
@@ -21,7 +21,7 @@ module Ci
     def cancel
       commit.builds.running_or_pending.each(&:cancel)
 
-      redirect_to ci_project_ref_commit_path(project, commit.ref, commit.sha)
+      redirect_to ci_project_ref_commits_path(project, commit.ref, commit.sha)
     end
 
     private
diff --git a/app/helpers/ci/commits_helper.rb b/app/helpers/ci/commits_helper.rb
index 748d12138b1..86f254223cb 100644
--- a/app/helpers/ci/commits_helper.rb
+++ b/app/helpers/ci/commits_helper.rb
@@ -15,8 +15,12 @@ module Ci
       end
     end
 
+    def ci_commit_path(commit)
+      ci_project_ref_commits_path(commit.project, commit.ref, commit.sha)
+    end
+
     def commit_link(commit)
-      link_to(commit.short_sha, ci_project_ref_commits_path(commit.project, commit.ref, commit.sha))
+      link_to(commit.short_sha, ci_commit_path(commit))
     end
 
     def truncate_first_line(message, length = 50)
diff --git a/spec/features/ci/commits_spec.rb b/spec/features/ci/commits_spec.rb
index 774beee9a10..40a62ca4574 100644
--- a/spec/features/ci/commits_spec.rb
+++ b/spec/features/ci/commits_spec.rb
@@ -1,17 +1,20 @@
 require 'spec_helper'
 
 describe "Commits" do
+  include Ci::CommitsHelper
+
   context "Authenticated user" do
     before do
-      login_as :user
       @project = FactoryGirl.create :ci_project
       @commit = FactoryGirl.create :ci_commit, project: @project
       @build = FactoryGirl.create :ci_build, commit: @commit
+      login_as :user
+      @project.gl_project.team << [@user, :master]
     end
 
     describe "GET /:project/commits/:sha" do
       before do
-        visit ci_project_ref_commit_path(@project, @commit.ref, @commit.sha)
+        visit ci_commit_path(@commit)
       end
 
       it { expect(page).to have_content @commit.sha[0..7] }
@@ -21,7 +24,7 @@ describe "Commits" do
 
     describe "Cancel commit" do
       it "cancels commit" do
-        visit ci_project_ref_commit_path(@project, @commit.ref, @commit.sha)
+        visit ci_commit_path(@commit)
         click_on "Cancel"
 
         expect(page).to have_content "canceled"
@@ -30,7 +33,7 @@ describe "Commits" do
 
     describe ".gitlab-ci.yml not found warning" do
       it "does not show warning" do
-        visit ci_project_ref_commit_path(@project, @commit.ref, @commit.sha)
+        visit ci_commit_path(@commit)
 
         expect(page).not_to have_content ".gitlab-ci.yml not found in this commit"
       end
@@ -39,7 +42,7 @@ describe "Commits" do
         @commit.push_data[:ci_yaml_file] = nil
         @commit.save
 
-        visit ci_project_ref_commit_path(@project, @commit.ref, @commit.sha)
+        visit ci_commit_path(@commit)
 
         expect(page).to have_content ".gitlab-ci.yml not found in this commit"
       end
@@ -55,7 +58,7 @@ describe "Commits" do
 
     describe "GET /:project/commits/:sha" do
       before do
-        visit ci_project_ref_commit_path(@project, @commit.ref, @commit.sha)
+        visit ci_commit_path(@commit)
       end
 
       it { expect(page).to have_content @commit.sha[0..7] }