summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-06-02 14:41:48 +0200
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-06-03 11:34:36 +0200
commit53fe06efde46acd2df62f818c421ecf3a0b971c9 (patch)
tree78a944fae5fd231c9fdecba321189fd1b3e1268d
parent0d19abf450d26fa76a23aaae38d392ecdef4e1e0 (diff)
downloadgitlab-ce-53fe06efde46acd2df62f818c421ecf3a0b971c9.tar.gz
Update ci commit pipeline specs according to changes
-rw-r--r--spec/models/ci/commit_spec.rb16
-rw-r--r--spec/services/create_commit_builds_service_spec.rb2
2 files changed, 9 insertions, 9 deletions
diff --git a/spec/models/ci/commit_spec.rb b/spec/models/ci/commit_spec.rb
index 22f8639e5ab..0939eb946ac 100644
--- a/spec/models/ci/commit_spec.rb
+++ b/spec/models/ci/commit_spec.rb
@@ -346,9 +346,9 @@ describe Ci::Commit, models: true do
end
end
- describe '#update_state' do
- it 'execute update_state after touching object' do
- expect(commit).to receive(:update_state).and_return(true)
+ describe '#update_state!' do
+ it 'execute update_state! after touching object' do
+ expect(commit).to receive(:update_state!).and_return(true)
commit.touch
end
@@ -356,17 +356,17 @@ describe Ci::Commit, models: true do
let(:commit_status) { build :commit_status, commit: commit }
it 'execute update_state after saving dependent object' do
- expect(commit).to receive(:update_state).and_return(true)
+ expect(commit).to receive(:update_state!).and_return(true)
commit_status.save
end
end
context 'update state' do
let(:current) { Time.now.change(usec: 0) }
- let(:build) { FactoryGirl.create :ci_build, :success, commit: commit, started_at: current - 120, finished_at: current - 60 }
-
- before do
- build
+ let!(:build) do
+ create :ci_build, :success, commit: commit,
+ started_at: current - 120,
+ finished_at: current - 60
end
[:status, :started_at, :finished_at, :duration].each do |param|
diff --git a/spec/services/create_commit_builds_service_spec.rb b/spec/services/create_commit_builds_service_spec.rb
index dc915e9dd77..b116e3e8fb4 100644
--- a/spec/services/create_commit_builds_service_spec.rb
+++ b/spec/services/create_commit_builds_service_spec.rb
@@ -183,7 +183,7 @@ describe CreateCommitBuildsService, services: true do
ref: 'refs/heads/master',
before: '00000000',
after: '31das312',
- commits: [{ message: 'some msg'} ])
+ commits: [{ message: 'some msg' }])
expect(result).to be false
expect(Ci::Build.all).to be_empty