diff options
author | Valery Sizov <vsv2711@gmail.com> | 2015-09-15 16:42:02 +0300 |
---|---|---|
committer | Valery Sizov <vsv2711@gmail.com> | 2015-09-15 17:43:17 +0300 |
commit | b87ca7500f174cc9a4e90b262b02aa9bf695fbee (patch) | |
tree | 252237f0ea72354fbd2ec140580bcca7503a400f /spec/models | |
parent | 88b3195ecfd2d0d74c4e76ce79961cb6db2f8643 (diff) |
fix specs. Stage 7
Diffstat (limited to 'spec/models')
-rw-r--r-- | spec/models/ci/mail_service_spec.rb | 2 | ||||
-rw-r--r-- | spec/models/ci/project_services/slack_message_spec.rb | 4 | ||||
-rw-r--r-- | spec/models/ci/project_services/slack_service_spec.rb | 4 | ||||
-rw-r--r-- | spec/models/ci/runner_spec.rb | 4 | ||||
-rw-r--r-- | spec/models/ci/service_spec.rb | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/spec/models/ci/mail_service_spec.rb b/spec/models/ci/mail_service_spec.rb index 51511641afc..564c2941bb5 100644 --- a/spec/models/ci/mail_service_spec.rb +++ b/spec/models/ci/mail_service_spec.rb @@ -169,7 +169,7 @@ describe Ci::MailService do end it do - Build.retry(build) + Ci::Build.retry(build) should_email(commit.git_author_email) should_email("jeroen@example.com") mail.execute(build) if mail.can_execute?(build) diff --git a/spec/models/ci/project_services/slack_message_spec.rb b/spec/models/ci/project_services/slack_message_spec.rb index ef0714909d5..f5335903728 100644 --- a/spec/models/ci/project_services/slack_message_spec.rb +++ b/spec/models/ci/project_services/slack_message_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe Ci::SlackMessage do - subject { SlackMessage.new(commit) } + subject { Ci::SlackMessage.new(commit) } let(:project) { FactoryGirl.create :ci_project } @@ -43,7 +43,7 @@ describe Ci::SlackMessage do end context "Several builds" do - let(:commit) { FactoryGirl.create(:commit_with_two_jobs, project: project) } + let(:commit) { FactoryGirl.create(:ci_commit_with_two_jobs, project: project) } context 'when all matrix builds succeeded' do let(:color) { 'good' } diff --git a/spec/models/ci/project_services/slack_service_spec.rb b/spec/models/ci/project_services/slack_service_spec.rb index ae577adfb75..0524f472432 100644 --- a/spec/models/ci/project_services/slack_service_spec.rb +++ b/spec/models/ci/project_services/slack_service_spec.rb @@ -30,7 +30,7 @@ describe Ci::SlackService do end describe "Execute" do - let(:slack) { SlackService.new } + let(:slack) { Ci::SlackService.new } let(:project) { FactoryGirl.create :ci_project } let(:commit) { FactoryGirl.create :ci_commit, project: project } let(:build) { FactoryGirl.create :ci_build, commit: commit, status: 'failed' } @@ -50,7 +50,7 @@ describe Ci::SlackService do it "should call Slack API" do slack.execute(build) - SlackNotifierWorker.drain + Ci::SlackNotifierWorker.drain expect(WebMock).to have_requested(:post, webhook_url).once end diff --git a/spec/models/ci/runner_spec.rb b/spec/models/ci/runner_spec.rb index c6130b69964..757593a7ab8 100644 --- a/spec/models/ci/runner_spec.rb +++ b/spec/models/ci/runner_spec.rb @@ -22,7 +22,7 @@ require 'spec_helper' describe Ci::Runner do describe '#display_name' do it 'should return the description if it has a value' do - runner = FactoryGirl.build(:runner, description: 'Linux/Ruby-1.9.3-p448') + runner = FactoryGirl.build(:ci_runner, description: 'Linux/Ruby-1.9.3-p448') expect(runner.display_name).to eq 'Linux/Ruby-1.9.3-p448' end @@ -32,7 +32,7 @@ describe Ci::Runner do end it 'should return the token if the description is an empty string' do - runner = FactoryGirl.build(:runner, description: '') + runner = FactoryGirl.build(:ci_runner, description: '') expect(runner.display_name).to eq runner.token end end diff --git a/spec/models/ci/service_spec.rb b/spec/models/ci/service_spec.rb index 04807a705eb..2c575056b08 100644 --- a/spec/models/ci/service_spec.rb +++ b/spec/models/ci/service_spec.rb @@ -25,7 +25,7 @@ describe Ci::Service do describe "Test Button" do before do - @service = Service.new + @service = Ci::Service.new end describe "Testable" do |