diff options
author | Valery Sizov <vsv2711@gmail.com> | 2015-09-15 15:51:03 +0300 |
---|---|---|
committer | Valery Sizov <vsv2711@gmail.com> | 2015-09-15 15:51:03 +0300 |
commit | e2cbb36ba9751021174fd188d1c29e736f7b5d3d (patch) | |
tree | 3515122e7480e80b68c7d527d6cc88529148dfae /spec/models | |
parent | 16ba41a186d5ff393f7d1e3ac1b94fba485aad12 (diff) |
fix specs. Stage 5
Diffstat (limited to 'spec/models')
-rw-r--r-- | spec/models/ci/build_spec.rb | 2 | ||||
-rw-r--r-- | spec/models/ci/project_services/hip_chat_service_spec.rb | 1 | ||||
-rw-r--r-- | spec/models/ci/service_spec.rb | 6 | ||||
-rw-r--r-- | spec/models/ci/web_hook_spec.rb | 6 |
4 files changed, 6 insertions, 9 deletions
diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb index 4f57003565a..dacdf38a875 100644 --- a/spec/models/ci/build_spec.rb +++ b/spec/models/ci/build_spec.rb @@ -56,7 +56,7 @@ describe Ci::Build do end let(:create_from_build) { Ci::Build.create_from build } - it ('there should be a pending task') do + it 'there should be a pending task' do expect(Ci::Build.pending.count(:all)).to eq 0 create_from_build expect(Ci::Build.pending.count(:all)).to be > 0 diff --git a/spec/models/ci/project_services/hip_chat_service_spec.rb b/spec/models/ci/project_services/hip_chat_service_spec.rb index 33a3a8109e5..59deb19c23a 100644 --- a/spec/models/ci/project_services/hip_chat_service_spec.rb +++ b/spec/models/ci/project_services/hip_chat_service_spec.rb @@ -72,4 +72,3 @@ describe Ci::HipChatService do end end end - diff --git a/spec/models/ci/service_spec.rb b/spec/models/ci/service_spec.rb index 8c4df391555..04807a705eb 100644 --- a/spec/models/ci/service_spec.rb +++ b/spec/models/ci/service_spec.rb @@ -29,9 +29,9 @@ describe Ci::Service do end describe "Testable" do - let (:project) { FactoryGirl.create :ci_project } - let (:commit) { FactoryGirl.create :ci_commit, project: project } - let (:build) { FactoryGirl.create :ci_build, commit: commit } + let(:project) { FactoryGirl.create :ci_project } + let(:commit) { FactoryGirl.create :ci_commit, project: project } + let(:build) { FactoryGirl.create :ci_build, commit: commit } before do allow(@service).to receive_messages( diff --git a/spec/models/ci/web_hook_spec.rb b/spec/models/ci/web_hook_spec.rb index bb58f645caf..66170d111a9 100644 --- a/spec/models/ci/web_hook_spec.rb +++ b/spec/models/ci/web_hook_spec.rb @@ -36,7 +36,7 @@ describe Ci::WebHook do before(:each) do @web_hook = FactoryGirl.create(:ci_web_hook) @project = @web_hook.project - @data = { before: 'oldrev', after: 'newrev', ref: 'ref'} + @data = { before: 'oldrev', after: 'newrev', ref: 'ref' } WebMock.stub_request(:post, @web_hook.url) end @@ -56,9 +56,7 @@ describe Ci::WebHook do it "catches exceptions" do expect(WebHook).to receive(:post).and_raise("Some HTTP Post error") - expect { - @web_hook.execute(@data) - }.to raise_error + expect{ @web_hook.execute(@data) }.to raise_error end end end |