diff options
author | Robert Speicher <rspeicher@gmail.com> | 2015-08-30 18:54:27 -0400 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2015-08-30 18:54:27 -0400 |
commit | 976bffef4b68ad68c528189693f4f0feed5eadaa (patch) | |
tree | 79383b777f24331aa8e4a2b36844c1272a3802cf | |
parent | 983b720926b8461d03c9c29a9393d13e883ab572 (diff) | |
download | gitlab-ci-976bffef4b68ad68c528189693f4f0feed5eadaa.tar.gz |
Update `stub` syntax usages
-rw-r--r-- | spec/lib/upgrader_spec.rb | 2 | ||||
-rw-r--r-- | spec/models/commit_spec.rb | 10 | ||||
-rw-r--r-- | spec/models/mail_service_spec.rb | 24 | ||||
-rw-r--r-- | spec/models/network_spec.rb | 18 | ||||
-rw-r--r-- | spec/models/project_services/hip_chat_service_spec.rb | 2 | ||||
-rw-r--r-- | spec/models/project_services/slack_service_spec.rb | 2 | ||||
-rw-r--r-- | spec/models/project_spec.rb | 16 | ||||
-rw-r--r-- | spec/models/service_spec.rb | 4 | ||||
-rw-r--r-- | spec/models/user_spec.rb | 4 |
9 files changed, 34 insertions, 48 deletions
diff --git a/spec/lib/upgrader_spec.rb b/spec/lib/upgrader_spec.rb index 9d86af0..0e96e3f 100644 --- a/spec/lib/upgrader_spec.rb +++ b/spec/lib/upgrader_spec.rb @@ -10,7 +10,7 @@ describe Upgrader do describe 'latest_version?' do it 'should be true if newest version' do - upgrader.stub(latest_version_raw: current_version) + allow(upgrader).to receive_messages(latest_version_raw: current_version) upgrader.latest_version?.should be_truthy end end diff --git a/spec/models/commit_spec.rb b/spec/models/commit_spec.rb index 2fe9378..f5b30f7 100644 --- a/spec/models/commit_spec.rb +++ b/spec/models/commit_spec.rb @@ -67,7 +67,7 @@ describe Commit do email_recipients: '' commit = FactoryGirl.create :commit, project: project expected = 'commit_pusher_email' - commit.stub(:push_data) { { user_email: expected } } + allow(commit).to receive(:push_data) { { user_email: expected } } commit.project_recipients.should eq [expected] end @@ -77,7 +77,7 @@ describe Commit do email_recipients: 'rec1 rec2' commit = FactoryGirl.create :commit, project: project expected = 'commit_pusher_email' - commit.stub(:push_data) { { user_email: expected } } + allow(commit).to receive(:push_data) { { user_email: expected } } commit.project_recipients.should eq ['rec1', 'rec2', expected] end @@ -95,7 +95,7 @@ describe Commit do email_recipients: 'rec1 rec1 rec2' commit = FactoryGirl.create :commit, project: project expected = 'rec2' - commit.stub(:push_data) { { user_email: expected } } + allow(commit).to receive(:push_data) { { user_email: expected } } commit.project_recipients.should eq ['rec1', 'rec2'] end end @@ -136,7 +136,7 @@ describe Commit do describe '#create_next_builds' do before do - commit.stub(:config_processor).and_return(config_processor) + allow(commit).to receive(:config_processor).and_return(config_processor) end it "creates builds for next type" do @@ -158,7 +158,7 @@ describe Commit do describe '#create_builds' do before do - commit.stub(:config_processor).and_return(config_processor) + allow(commit).to receive(:config_processor).and_return(config_processor) end it 'creates builds' do diff --git a/spec/models/mail_service_spec.rb b/spec/models/mail_service_spec.rb index a3879f1..adc0153 100644 --- a/spec/models/mail_service_spec.rb +++ b/spec/models/mail_service_spec.rb @@ -36,9 +36,7 @@ describe MailService do let(:build) { FactoryGirl.create(:build, status: :failed, commit: commit) } before do - mail.stub( - project: project - ) + allow(mail).to receive_messages(project: project) end it do @@ -58,9 +56,7 @@ describe MailService do let(:build) { FactoryGirl.create(:build, status: :success, commit: commit) } before do - mail.stub( - project: project - ) + allow(mail).to receive_messages(project: project) end it do @@ -85,9 +81,7 @@ describe MailService do let(:build) { FactoryGirl.create(:build, status: :success, commit: commit) } before do - mail.stub( - project: project - ) + allow(mail).to receive_messages(project: project) end it do @@ -113,9 +107,7 @@ describe MailService do let(:build) { FactoryGirl.create(:build, status: :success, commit: commit) } before do - mail.stub( - project: project - ) + allow(mail).to receive_messages(project: project) end it do @@ -141,9 +133,7 @@ describe MailService do let(:build) { FactoryGirl.create(:build, status: :success, commit: commit) } before do - mail.stub( - project: project - ) + allow(mail).to receive_messages(project: project) build end @@ -163,9 +153,7 @@ describe MailService do let(:build) { FactoryGirl.create(:build, status: :failed, commit: commit) } before do - mail.stub( - project: project - ) + allow(mail).to receive_messages(project: project) end it do diff --git a/spec/models/network_spec.rb b/spec/models/network_spec.rb index a527338..199590f 100644 --- a/spec/models/network_spec.rb +++ b/spec/models/network_spec.rb @@ -9,8 +9,8 @@ describe Network do context 'on success' do before do response = double - response.stub(:code) { 200 } - network.class.stub(:put) { response } + allow(response).to receive(:code) { 200 } + allow(network.class).to receive(:put) { response } end it { should be_truthy } @@ -19,8 +19,8 @@ describe Network do context 'on failure' do before do response = double - response.stub(:code) { 404 } - network.class.stub(:put) { response } + allow(response).to receive(:code) { 404 } + allow(network.class).to receive(:put) { response } end it { should be_nil } @@ -34,9 +34,9 @@ describe Network do context 'on success' do let(:parsed_response) { 'parsed' } before do - response.stub(:code) { 200 } - response.stub(:parsed_response) { parsed_response } - network.class.stub(:delete) { response } + allow(response).to receive(:code) { 200 } + allow(response).to receive(:parsed_response) { parsed_response } + allow(network.class).to receive(:delete) { response } end it { should equal(parsed_response) } @@ -44,8 +44,8 @@ describe Network do context 'on failure' do before do - response.stub(:code) { 404 } - network.class.stub(:delete) { response } + allow(response).to receive(:code) { 404 } + allow(network.class).to receive(:delete) { response } end it { should be_nil } diff --git a/spec/models/project_services/hip_chat_service_spec.rb b/spec/models/project_services/hip_chat_service_spec.rb index 37ce490..f3137bc 100644 --- a/spec/models/project_services/hip_chat_service_spec.rb +++ b/spec/models/project_services/hip_chat_service_spec.rb @@ -39,7 +39,7 @@ describe HipChatService do let(:api_url) { 'https://api.hipchat.com/v2/room/123/notification?auth_token=a1b2c3d4e5f6' } before do - service.stub( + allow(service).to receive_messages( project: project, project_id: project.id, notify_only_broken_builds: false, diff --git a/spec/models/project_services/slack_service_spec.rb b/spec/models/project_services/slack_service_spec.rb index e1c1428..75a321c 100644 --- a/spec/models/project_services/slack_service_spec.rb +++ b/spec/models/project_services/slack_service_spec.rb @@ -38,7 +38,7 @@ describe SlackService do let(:notify_only_broken_builds) { false } before do - slack.stub( + allow(slack).to receive_messages( project: project, project_id: project.id, webhook: webhook_url, diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index b8d9870..d3b0e07 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -96,29 +96,29 @@ describe Project do describe '#broken_or_success?' do it { project = FactoryGirl.create :project, email_add_pusher: true - project.stub(:broken?).and_return(true) - project.stub(:success?).and_return(true) + allow(project).to receive(:broken?).and_return(true) + allow(project).to receive(:success?).and_return(true) project.broken_or_success?.should eq true } it { project = FactoryGirl.create :project, email_add_pusher: true - project.stub(:broken?).and_return(true) - project.stub(:success?).and_return(false) + allow(project).to receive(:broken?).and_return(true) + allow(project).to receive(:success?).and_return(false) project.broken_or_success?.should eq true } it { project = FactoryGirl.create :project, email_add_pusher: true - project.stub(:broken?).and_return(false) - project.stub(:success?).and_return(true) + allow(project).to receive(:broken?).and_return(false) + allow(project).to receive(:success?).and_return(true) project.broken_or_success?.should eq true } it { project = FactoryGirl.create :project, email_add_pusher: true - project.stub(:broken?).and_return(false) - project.stub(:success?).and_return(false) + allow(project).to receive(:broken?).and_return(false) + allow(project).to receive(:success?).and_return(false) project.broken_or_success?.should eq false } end diff --git a/spec/models/service_spec.rb b/spec/models/service_spec.rb index 7158fdd..f6b9c00 100644 --- a/spec/models/service_spec.rb +++ b/spec/models/service_spec.rb @@ -34,9 +34,7 @@ describe Service do let (:build) { FactoryGirl.create :build, commit: commit } before do - @service.stub( - project: project - ) + allow(@service).to receive_messages(project: project) build @testable = @service.can_test? end diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 73b361d..57c0b93 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -40,13 +40,13 @@ describe User do end it "returns false for reporter" do - @user.stub(:project_info).and_return(project_with_reporter_access) + allow(@user).to receive(:project_info).and_return(project_with_reporter_access) @user.has_developer_access?(1).should be_falsey end it "returns true for owner" do - @user.stub(:project_info).and_return(project_with_owner_access) + allow(@user).to receive(:project_info).and_return(project_with_owner_access) @user.has_developer_access?(1).should be_truthy end |