1 files changed, 10 insertions, 9 deletions
diff --git a/spec/features/ci/builds_spec.rb b/spec/features/ci/builds_spec.rb
index 2f020e524e2..d65699dbefa 100644
--- a/spec/features/ci/builds_spec.rb
+++ b/spec/features/ci/builds_spec.rb
@@ -3,16 +3,15 @@ require 'spec_helper'
 describe "Builds" do
   context :private_project do
     before do
-      @project = FactoryGirl.create :ci_project
-      @commit = FactoryGirl.create :ci_commit, project: @project
+      @commit = FactoryGirl.create :ci_commit
       @build = FactoryGirl.create :ci_build, commit: @commit
       login_as :user
-      @project.gl_project.team << [@user, :master]
+      @commit.project.gl_project.team << [@user, :master]
     end
 
     describe "GET /:project/builds/:id" do
       before do
-        visit ci_project_build_path(@project, @build)
+        visit ci_project_build_path(@commit.project, @build)
       end
 
       it { expect(page).to have_content @commit.sha[0..7] }
@@ -23,7 +22,7 @@ describe "Builds" do
     describe "GET /:project/builds/:id/cancel" do
       before do
         @build.run!
-        visit cancel_ci_project_build_path(@project, @build)
+        visit cancel_ci_project_build_path(@commit.project, @build)
       end
 
       it { expect(page).to have_content 'canceled' }
@@ -33,7 +32,7 @@ describe "Builds" do
     describe "POST /:project/builds/:id/retry" do
       before do
         @build.cancel!
-        visit ci_project_build_path(@project, @build)
+        visit ci_project_build_path(@commit.project, @build)
         click_link 'Retry'
       end
 
@@ -45,13 +44,15 @@ describe "Builds" do
   context :public_project do
     describe "Show page public accessible" do
       before do
-        @project = FactoryGirl.create :ci_public_project
-        @commit = FactoryGirl.create :ci_commit, project: @project
+        @commit = FactoryGirl.create :ci_commit
+        @commit.project.public = true
+        @commit.project.save
+        
         @runner = FactoryGirl.create :ci_specific_runner
         @build = FactoryGirl.create :ci_build, commit: @commit, runner: @runner
 
         stub_gitlab_calls
-        visit ci_project_build_path(@project, @build)
+        visit ci_project_build_path(@commit.project, @build)
       end
 
       it { expect(page).to have_content @commit.sha[0..7] }