Fix specs

13 files changed, 47 insertions, 160 deletions

diff --git a/spec/features/commits_spec.rb b/spec/features/commits_spec.rb
index dacaa96d760..80e80ea665d 100644
--- a/spec/features/commits_spec.rb
+++ b/spec/features/commits_spec.rb
@@ -162,4 +162,9 @@ describe 'Commits' do
       end
     end
   end
+
+  def ci_status_path(ci_commit)
+    project = ci_commit.project
+    builds_namespace_project_commit_path(project.namespace, project, ci_commit.sha)
+  end
 end
diff --git a/spec/helpers/ci_status_helper_spec.rb b/spec/helpers/ci_status_helper_spec.rb
index 4f8d9c67262..906db0ea829 100644
--- a/spec/helpers/ci_status_helper_spec.rb
+++ b/spec/helpers/ci_status_helper_spec.rb
@@ -7,7 +7,7 @@ describe CiStatusHelper do
   let(:failed_commit) { double("Ci::Commit", status: 'failed') }
 
   describe 'ci_status_icon' do
-    it { expect(helper.ci_status_icon(success_commit)).to include('fa-check') }
-    it { expect(helper.ci_status_icon(failed_commit)).to include('fa-close') }
+    it { expect(helper.ci_icon_for_status(success_commit.status)).to include('fa-check') }
+    it { expect(helper.ci_icon_for_status(failed_commit.status)).to include('fa-close') }
   end
 end
diff --git a/spec/lib/gitlab/badge/build_spec.rb b/spec/lib/gitlab/badge/build_spec.rb
index 329792bb685..b6f7a2e7ec4 100644
--- a/spec/lib/gitlab/badge/build_spec.rb
+++ b/spec/lib/gitlab/badge/build_spec.rb
@@ -42,7 +42,7 @@ describe Gitlab::Badge::Build do
   end
 
   context 'build exists' do
-    let(:ci_commit) { create(:ci_commit, project: project, sha: sha) }
+    let(:ci_commit) { create(:ci_commit, project: project, sha: sha, ref: branch) }
     let!(:build) { create(:ci_build, commit: ci_commit) }
 
 
@@ -57,7 +57,7 @@ describe Gitlab::Badge::Build do
       describe '#data' do
         let(:data) { badge.data }
 
-        it 'contains infromation about success' do
+        it 'contains information about success' do
           expect(status_node(data, 'success')).to be_truthy
         end
       end
@@ -74,7 +74,7 @@ describe Gitlab::Badge::Build do
       describe '#data' do
         let(:data) { badge.data }
 
-        it 'contains infromation about failure' do
+        it 'contains information about failure' do
           expect(status_node(data, 'failed')).to be_truthy
         end
       end
diff --git a/spec/models/ci/commit_spec.rb b/spec/models/ci/commit_spec.rb
index 412842337ba..fb3b61ad7c7 100644
--- a/spec/models/ci/commit_spec.rb
+++ b/spec/models/ci/commit_spec.rb
@@ -52,57 +52,9 @@ describe Ci::Commit, models: true do
     it { expect(commit.sha).to start_with(subject) }
   end
 
-  describe :stage do
-    subject { commit.stage }
-
-    before do
-      @second = FactoryGirl.create :commit_status, commit: commit, name: 'deploy', stage: 'deploy', stage_idx: 1, status: 'pending'
-      @first = FactoryGirl.create :commit_status, commit: commit, name: 'test', stage: 'test', stage_idx: 0, status: 'pending'
-    end
-
-    it 'returns first running stage' do
-      is_expected.to eq('test')
-    end
-
-    context 'first build succeeded' do
-      before do
-        @first.success
-      end
-
-      it 'returns last running stage' do
-        is_expected.to eq('deploy')
-      end
-    end
-
-    context 'all builds succeeded' do
-      before do
-        @first.success
-        @second.success
-      end
-
-      it 'returns nil' do
-        is_expected.to be_nil
-      end
-    end
-  end
-
   describe :create_next_builds do
   end
 
-  describe :refs do
-    subject { commit.refs }
-
-    before do
-      FactoryGirl.create :commit_status, commit: commit, name: 'deploy'
-      FactoryGirl.create :commit_status, commit: commit, name: 'deploy', ref: 'develop'
-      FactoryGirl.create :commit_status, commit: commit, name: 'deploy', ref: 'master'
-    end
-
-    it 'returns all refs' do
-      is_expected.to contain_exactly('master', 'develop', nil)
-    end
-  end
-
   describe :retried do
     subject { commit.retried }
 
@@ -117,10 +69,10 @@ describe Ci::Commit, models: true do
   end
 
   describe :create_builds do
-    let!(:commit) { FactoryGirl.create :ci_commit, project: project }
+    let!(:commit) { FactoryGirl.create :ci_commit, project: project, ref: 'master', tag: false }
 
     def create_builds(trigger_request = nil)
-      commit.create_builds('master', false, nil, trigger_request)
+      commit.create_builds(nil, trigger_request)
     end
 
     def create_next_builds
@@ -143,67 +95,6 @@ describe Ci::Commit, models: true do
       expect(create_next_builds).to be_falsey
     end
 
-    context 'for different ref' do
-      def create_develop_builds
-        commit.create_builds('develop', false, nil, nil)
-      end
-
-      it 'creates builds' do
-        expect(create_builds).to be_truthy
-        commit.builds.update_all(status: "success")
-        expect(commit.builds.count(:all)).to eq(2)
-
-        expect(create_develop_builds).to be_truthy
-        commit.builds.update_all(status: "success")
-        expect(commit.builds.count(:all)).to eq(4)
-        expect(commit.refs.size).to eq(2)
-        expect(commit.builds.pluck(:name).uniq.size).to eq(2)
-      end
-    end
-
-    context 'for build triggers' do
-      let(:trigger) { FactoryGirl.create :ci_trigger, project: project }
-      let(:trigger_request) { FactoryGirl.create :ci_trigger_request, commit: commit, trigger: trigger }
-
-      it 'creates builds' do
-        expect(create_builds(trigger_request)).to be_truthy
-        expect(commit.builds.count(:all)).to eq(2)
-      end
-
-      it 'rebuilds commit' do
-        expect(create_builds).to be_truthy
-        expect(commit.builds.count(:all)).to eq(2)
-
-        expect(create_builds(trigger_request)).to be_truthy
-        expect(commit.builds.count(:all)).to eq(4)
-      end
-
-      it 'creates next builds' do
-        expect(create_builds(trigger_request)).to be_truthy
-        expect(commit.builds.count(:all)).to eq(2)
-        commit.builds.update_all(status: "success")
-
-        expect(create_next_builds).to be_truthy
-        expect(commit.builds.count(:all)).to eq(4)
-      end
-
-      context 'for [ci skip]' do
-        before do
-          allow(commit).to receive(:git_commit_message) { 'message [ci skip]' }
-        end
-
-        it 'rebuilds commit' do
-          expect(commit.status).to eq('skipped')
-          expect(create_builds).to be_truthy
-
-          # since everything in Ci::Commit is cached we need to fetch a new object
-          new_commit = Ci::Commit.find_by_id(commit.id)
-          expect(new_commit.status).to eq('pending')
-        end
-      end
-    end
-
-
     context 'custom stage with first job allowed to fail' do
       let(:yaml) do
         {
@@ -284,6 +175,7 @@ describe Ci::Commit, models: true do
         commit.builds.running_or_pending.each(&:success)
 
         expect(commit.builds.pluck(:status)).to contain_exactly('success', 'success', 'success', 'success')
+        commit.reload
         expect(commit.status).to eq('success')
       end
 
@@ -306,6 +198,7 @@ describe Ci::Commit, models: true do
         commit.builds.running_or_pending.each(&:success)
 
         expect(commit.builds.pluck(:status)).to contain_exactly('success', 'failed', 'success', 'success')
+        commit.reload
         expect(commit.status).to eq('failed')
       end
 
@@ -329,6 +222,7 @@ describe Ci::Commit, models: true do
 
         expect(commit.builds.pluck(:name)).to contain_exactly('build', 'test', 'test_failure', 'cleanup')
         expect(commit.builds.pluck(:status)).to contain_exactly('success', 'failed', 'failed', 'success')
+        commit.reload
         expect(commit.status).to eq('failed')
       end
 
@@ -351,6 +245,7 @@ describe Ci::Commit, models: true do
         commit.builds.running_or_pending.each(&:success)
 
         expect(commit.builds.pluck(:status)).to contain_exactly('success', 'success', 'failed', 'success')
+        commit.reload
         expect(commit.status).to eq('failed')
       end
     end
diff --git a/spec/models/commit_status_spec.rb b/spec/models/commit_status_spec.rb
index 82c68ff6cb1..1c64947f1f5 100644
--- a/spec/models/commit_status_spec.rb
+++ b/spec/models/commit_status_spec.rb
@@ -163,21 +163,7 @@ describe CommitStatus, models: true do
     end
 
     it 'return unique statuses' do
-      is_expected.to eq([@commit2, @commit3, @commit4, @commit5])
-    end
-  end
-
-  describe :for_ref do
-    subject { CommitStatus.for_ref('bb').order(:id) }
-
-    before do
-      @commit1 = FactoryGirl.create :commit_status, commit: commit, name: 'aa', ref: 'bb', status: 'running'
-      @commit2 = FactoryGirl.create :commit_status, commit: commit, name: 'cc', ref: 'cc', status: 'pending'
-      @commit3 = FactoryGirl.create :commit_status, commit: commit, name: 'aa', ref: nil, status: 'success'
-    end
-
-    it 'return statuses with equal and nil ref set' do
-      is_expected.to eq([@commit1])
+      is_expected.to eq([@commit4, @commit5])
     end
   end
 
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index 6f5d912fe5d..d7884cea336 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -404,12 +404,12 @@ describe MergeRequest, models: true do
     describe 'when the source project exists' do
       it 'returns the latest commit' do
         commit    = double(:commit, id: '123abc')
-        ci_commit = double(:ci_commit)
+        ci_commit = double(:ci_commit, ref: 'master')
 
         allow(subject).to receive(:last_commit).and_return(commit)
 
         expect(subject.source_project).to receive(:ci_commit).
-          with('123abc').
+          with('123abc', 'master').
           and_return(ci_commit)
 
         expect(subject.ci_commit).to eq(ci_commit)
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index f29c389e094..1688e91ca62 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -441,9 +441,9 @@ describe Project, models: true do
 
   describe :ci_commit do
     let(:project) { create :project }
-    let(:commit) { create :ci_commit, project: project }
+    let(:commit) { create :ci_commit, project: project, ref: 'master' }
 
-    it { expect(project.ci_commit(commit.sha)).to eq(commit) }
+    it { expect(project.ci_commit(commit.sha, 'master')).to eq(commit) }
   end
 
   describe :builds_enabled do
diff --git a/spec/requests/api/builds_spec.rb b/spec/requests/api/builds_spec.rb
index 967c34800d0..5ead735be48 100644
--- a/spec/requests/api/builds_spec.rb
+++ b/spec/requests/api/builds_spec.rb
@@ -59,7 +59,7 @@ describe API::API, api: true  do
 
   describe 'GET /projects/:id/repository/commits/:sha/builds' do
     before do
-      project.ensure_ci_commit(commit.sha)
+      project.ensure_ci_commit(commit.sha, 'master')
       get api("/projects/#{project.id}/repository/commits/#{commit.sha}/builds", api_user)
     end
 
diff --git a/spec/requests/api/commit_status_spec.rb b/spec/requests/api/commit_status_spec.rb
index 429a24109fd..f3785b19362 100644
--- a/spec/requests/api/commit_status_spec.rb
+++ b/spec/requests/api/commit_status_spec.rb
@@ -16,7 +16,8 @@ describe API::CommitStatus, api: true do
     let(:get_url) { "/projects/#{project.id}/repository/commits/#{sha}/statuses" }
 
     context 'ci commit exists' do
-      let!(:ci_commit) { project.ensure_ci_commit(commit.id) }
+      let!(:master) { project.ci_commits.create(sha: commit.id, ref: 'master') }
+      let!(:develop) { project.ci_commits.create(sha: commit.id, ref: 'develop') }
 
       it_behaves_like 'a paginated resources' do
         let(:request) { get api(get_url, reporter) }
@@ -25,16 +26,16 @@ describe API::CommitStatus, api: true do
       context "reporter user" do
         let(:statuses_id) { json_response.map { |status| status['id'] } }
 
-        def create_status(opts = {})
-          create(:commit_status, { commit: ci_commit }.merge(opts))
+        def create_status(commit, opts = {})
+          create(:commit_status, { commit: commit, ref: commit.ref }.merge(opts))
         end
 
-        let!(:status1) { create_status(status: 'running') }
-        let!(:status2) { create_status(name: 'coverage', status: 'pending') }
-        let!(:status3) { create_status(ref: 'develop', status: 'running', allow_failure: true) }
-        let!(:status4) { create_status(name: 'coverage', status: 'success') }
-        let!(:status5) { create_status(name: 'coverage', ref: 'develop', status: 'success') }
-        let!(:status6) { create_status(status: 'success') }
+        let!(:status1) { create_status(master, status: 'running') }
+        let!(:status2) { create_status(master, name: 'coverage', status: 'pending') }
+        let!(:status3) { create_status(develop, status: 'running', allow_failure: true) }
+        let!(:status4) { create_status(master, name: 'coverage', status: 'success') }
+        let!(:status5) { create_status(develop, name: 'coverage', status: 'success') }
+        let!(:status6) { create_status(master, status: 'success') }
 
         context 'latest commit statuses' do
           before { get api(get_url, reporter) }
diff --git a/spec/requests/api/commits_spec.rb b/spec/requests/api/commits_spec.rb
index 7ff21175c1b..25377a40442 100644
--- a/spec/requests/api/commits_spec.rb
+++ b/spec/requests/api/commits_spec.rb
@@ -51,11 +51,11 @@ describe API::API, api: true  do
       it "should return not_found for CI status" do
         get api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}", user)
         expect(response.status).to eq(200)
-        expect(json_response['status']).to eq('not_found')
+        expect(json_response['status']).to be_nil
       end
 
       it "should return status for CI" do
-        ci_commit = project.ensure_ci_commit(project.repository.commit.sha)
+        ci_commit = project.ensure_ci_commit(project.repository.commit.sha, 'master')
         get api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}", user)
         expect(response.status).to eq(200)
         expect(json_response['status']).to eq(ci_commit.status)
diff --git a/spec/requests/ci/api/builds_spec.rb b/spec/requests/ci/api/builds_spec.rb
index 57d7eb927fd..b652b488b5a 100644
--- a/spec/requests/ci/api/builds_spec.rb
+++ b/spec/requests/ci/api/builds_spec.rb
@@ -20,8 +20,8 @@ describe Ci::API::API do
 
     describe "POST /builds/register" do
       it "should start a build" do
-        commit = FactoryGirl.create(:ci_commit, project: project)
-        commit.create_builds('master', false, nil)
+        commit = FactoryGirl.create(:ci_commit, project: project, ref: 'master')
+        commit.create_builds(nil)
         build = commit.builds.first
 
         post ci_api("/builds/register"), token: runner.token, info: { platform: :darwin }
@@ -56,8 +56,8 @@ describe Ci::API::API do
       end
 
       it "returns options" do
-        commit = FactoryGirl.create(:ci_commit, project: project)
-        commit.create_builds('master', false, nil)
+        commit = FactoryGirl.create(:ci_commit, project: project, ref: 'master')
+        commit.create_builds(nil)
 
         post ci_api("/builds/register"), token: runner.token, info: { platform: :darwin }
 
@@ -66,8 +66,8 @@ describe Ci::API::API do
       end
 
       it "returns variables" do
-        commit = FactoryGirl.create(:ci_commit, project: project)
-        commit.create_builds('master', false, nil)
+        commit = FactoryGirl.create(:ci_commit, project: project, ref: 'master')
+        commit.create_builds(nil)
         project.variables << Ci::Variable.new(key: "SECRET_KEY", value: "secret_value")
 
         post ci_api("/builds/register"), token: runner.token, info: { platform: :darwin }
@@ -83,10 +83,10 @@ describe Ci::API::API do
 
       it "returns variables for triggers" do
         trigger = FactoryGirl.create(:ci_trigger, project: project)
-        commit = FactoryGirl.create(:ci_commit, project: project)
+        commit = FactoryGirl.create(:ci_commit, project: project, ref: 'master')
 
         trigger_request = FactoryGirl.create(:ci_trigger_request_with_variables, commit: commit, trigger: trigger)
-        commit.create_builds('master', false, nil, trigger_request)
+        commit.create_builds(nil, trigger_request)
         project.variables << Ci::Variable.new(key: "SECRET_KEY", value: "secret_value")
 
         post ci_api("/builds/register"), token: runner.token, info: { platform: :darwin }
@@ -103,8 +103,8 @@ describe Ci::API::API do
       end
 
       it "returns dependent builds" do
-        commit = FactoryGirl.create(:ci_commit, project: project)
-        commit.create_builds('master', false, nil, nil)
+        commit = FactoryGirl.create(:ci_commit, project: project, ref: 'master')
+        commit.create_builds(nil, nil)
         commit.builds.where(stage: 'test').each(&:success)
 
         post ci_api("/builds/register"), token: runner.token, info: { platform: :darwin }
diff --git a/spec/services/ci/create_builds_service_spec.rb b/spec/services/ci/create_builds_service_spec.rb
index 1fca3628686..ecc3a88a262 100644
--- a/spec/services/ci/create_builds_service_spec.rb
+++ b/spec/services/ci/create_builds_service_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Ci::CreateBuildsService, services: true do
-  let(:commit) { create(:ci_commit) }
+  let(:commit) { create(:ci_commit, ref: 'master') }
   let(:user) { create(:user) }
 
   describe '#execute' do
@@ -9,7 +9,7 @@ describe Ci::CreateBuildsService, services: true do
     #
 
     subject do
-      described_class.new.execute(commit, 'test', 'master', nil, user, nil, status)
+      described_class.new(commit).execute(commit, nil, user, status)
     end
 
     context 'next builds available' do
diff --git a/spec/services/ci/image_for_build_service_spec.rb b/spec/services/ci/image_for_build_service_spec.rb
index 870861ad20a..4cc4b3870d1 100644
--- a/spec/services/ci/image_for_build_service_spec.rb
+++ b/spec/services/ci/image_for_build_service_spec.rb
@@ -5,7 +5,7 @@ module Ci
     let(:service) { ImageForBuildService.new }
     let(:project) { FactoryGirl.create(:empty_project) }
     let(:commit_sha) { '01234567890123456789' }
-    let(:commit) { project.ensure_ci_commit(commit_sha) }
+    let(:commit) { project.ensure_ci_commit(commit_sha, 'master') }
     let(:build) { FactoryGirl.create(:ci_build, commit: commit) }
 
     describe :execute do