Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-06-02 22:02:52 +0300
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-06-03 12:34:36 +0300
commit8e811f2c6c4c74a30789ff5213de5ebc28897753 (patch)
tree1b3ff7996b2953b7b73bf5952dc9f9c8a195ddd8 /spec
parentc6bce7e63c305d07dbc91d032df9c783e0cf0c9f (diff)
Update CreateCommitBuildsService to pass tests
Diffstat (limited to 'spec')
-rw-r--r--spec/models/ci/commit_spec.rb6
-rw-r--r--spec/services/create_commit_builds_service_spec.rb8
2 files changed, 7 insertions, 7 deletions
diff --git a/spec/models/ci/commit_spec.rb b/spec/models/ci/commit_spec.rb
index 07b875e4f88..d36aca113a1 100644
--- a/spec/models/ci/commit_spec.rb
+++ b/spec/models/ci/commit_spec.rb
@@ -351,8 +351,8 @@ describe Ci::Commit, models: true do
end
describe '#update_state!' do
- it 'execute update_state! after touching object' do
- expect(commit).to receive(:update_state!).and_return(true)
+ it 'execute update_state after touching object' do
+ expect(commit).to receive(:update_state).and_return(true)
commit.touch
end
@@ -360,7 +360,7 @@ 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
diff --git a/spec/services/create_commit_builds_service_spec.rb b/spec/services/create_commit_builds_service_spec.rb
index b116e3e8fb4..e3202c959d9 100644
--- a/spec/services/create_commit_builds_service_spec.rb
+++ b/spec/services/create_commit_builds_service_spec.rb
@@ -60,7 +60,7 @@ describe CreateCommitBuildsService, services: true do
after: '31das312',
commits: [{ message: 'Message' }]
)
- expect(result).to be_falsey
+ expect(result).not_to be_persisted
expect(Ci::Commit.count).to eq(0)
end
@@ -174,7 +174,7 @@ describe CreateCommitBuildsService, services: true do
context 'when there are no jobs for this pipeline' do
before do
- config = YAML.dump({ test: { deploy: 'ls', only: ['feature'] } })
+ config = YAML.dump({ test: { script: 'ls', only: ['feature'] } })
stub_ci_commit_yaml_file(config)
end
@@ -184,9 +184,9 @@ describe CreateCommitBuildsService, services: true do
before: '00000000',
after: '31das312',
commits: [{ message: 'some msg' }])
-
- expect(result).to be false
+ expect(result).not_to be_persisted
expect(Ci::Build.all).to be_empty
+ expect(Ci::Commit.count).to eq(0)
end
end
end