diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-10 22:27:06 +0200 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-10 22:27:06 +0200 |
commit | 95a10f4533fdb708c61ffda95099bddd94800f02 (patch) | |
tree | bf5c561472c47d34e5ff1f643c49cd2a6b206f15 /spec/workers | |
parent | 17c6bec79d876ce932edc0edc5d17622adb2f724 (diff) | |
parent | b4e84809e8170a43126507da0bc6a3b94c33804b (diff) | |
download | gitlab-ce-95a10f4533fdb708c61ffda95099bddd94800f02.tar.gz |
Merge remote-tracking branch 'origin/master' into ci-lfs-fetch
Diffstat (limited to 'spec/workers')
-rw-r--r-- | spec/workers/post_receive_spec.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/spec/workers/post_receive_spec.rb b/spec/workers/post_receive_spec.rb index 20d3dfb42b3..b8e73682c91 100644 --- a/spec/workers/post_receive_spec.rb +++ b/spec/workers/post_receive_spec.rb @@ -52,16 +52,16 @@ describe PostReceive do context "gitlab-ci.yml" do subject { PostReceive.new.perform(pwd(project), key_id, base64_changes) } - context "creates a Ci::Commit for every change" do - before { stub_ci_commit_to_return_yaml_file } + context "creates a Ci::Pipeline for every change" do + before { stub_ci_pipeline_to_return_yaml_file } - it { expect{ subject }.to change{ Ci::Commit.count }.by(2) } + it { expect{ subject }.to change{ Ci::Pipeline.count }.by(2) } end - context "does not create a Ci::Commit" do - before { stub_ci_commit_yaml_file(nil) } + context "does not create a Ci::Pipeline" do + before { stub_ci_pipeline_yaml_file(nil) } - it { expect{ subject }.not_to change{ Ci::Commit.count } } + it { expect{ subject }.not_to change{ Ci::Pipeline.count } } end end end |