diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-10-05 14:12:00 +0300 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-10-05 14:12:00 +0300 |
commit | d2d2df0738f3cd8311963c34d90ebc8ce4081aa6 (patch) | |
tree | d3f342088131b73b62eb0e5cf494693fd80e5557 /spec/models/ci | |
parent | 361dc3641dd28c4ecefbda94f7a8dad299c349aa (diff) |
Fix next round of tests
Diffstat (limited to 'spec/models/ci')
-rw-r--r-- | spec/models/ci/build_spec.rb | 6 | ||||
-rw-r--r-- | spec/models/ci/commit_spec.rb | 11 | ||||
-rw-r--r-- | spec/models/ci/project_services/hip_chat_message_spec.rb | 6 | ||||
-rw-r--r-- | spec/models/ci/project_services/mail_service_spec.rb | 13 | ||||
-rw-r--r-- | spec/models/ci/project_services/slack_message_spec.rb | 6 |
5 files changed, 17 insertions, 25 deletions
diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb index d74063e5782..da56f6e31ae 100644 --- a/spec/models/ci/build_spec.rb +++ b/spec/models/ci/build_spec.rb @@ -28,7 +28,7 @@ require 'spec_helper' describe Ci::Build do let(:project) { FactoryGirl.create :ci_project } let(:gl_project) { FactoryGirl.create :empty_project, gitlab_ci_project: project } - let(:commit) { FactoryGirl.create :ci_commit_yaml_stub, gl_project: gl_project } + let(:commit) { FactoryGirl.create :ci_commit, gl_project: gl_project } let(:build) { FactoryGirl.create :ci_build, commit: commit } subject { build } @@ -352,8 +352,8 @@ describe Ci::Build do end describe :project_recipients do - let (:pusher_email) { 'pusher@gitlab.test' } - let (:user) { User.new(notification_email: pusher_email) } + let(:pusher_email) { 'pusher@gitlab.test' } + let(:user) { User.new(notification_email: pusher_email) } subject { build.project_recipients } before do diff --git a/spec/models/ci/commit_spec.rb b/spec/models/ci/commit_spec.rb index 63602e89e37..d18220f119b 100644 --- a/spec/models/ci/commit_spec.rb +++ b/spec/models/ci/commit_spec.rb @@ -66,15 +66,6 @@ describe Ci::Commit do end describe :short_sha do - subject { commit.short_before_sha } - - it 'has 8 items' do - expect(subject.size).to eq(8) - end - it { expect(commit.before_sha).to start_with(subject) } - end - - describe :short_sha do subject { commit.short_sha } it 'has 8 items' do @@ -87,7 +78,7 @@ describe Ci::Commit do end describe :create_builds do - let(:commit) { FactoryGirl.create :ci_commit_yaml_stub, gl_project: gl_project } + let(:commit) { FactoryGirl.create :ci_commit, gl_project: gl_project } def create_builds(trigger_request = nil) commit.create_builds('master', false, nil, trigger_request) diff --git a/spec/models/ci/project_services/hip_chat_message_spec.rb b/spec/models/ci/project_services/hip_chat_message_spec.rb index 1903c036924..6d257638359 100644 --- a/spec/models/ci/project_services/hip_chat_message_spec.rb +++ b/spec/models/ci/project_services/hip_chat_message_spec.rb @@ -7,7 +7,7 @@ describe Ci::HipChatMessage do let(:commit) { FactoryGirl.create(:ci_commit_with_one_job) } let(:build) do - commit.create_builds + commit.create_builds('master', false, nil) commit.builds.first end @@ -43,7 +43,7 @@ describe Ci::HipChatMessage do context 'when all matrix builds succeed' do it 'returns a successful message' do - commit.create_builds + commit.create_builds('master', false, nil) commit.builds.update_all(status: "success") commit.reload @@ -56,7 +56,7 @@ describe Ci::HipChatMessage do context 'when at least one matrix build fails' do it 'returns a failure message' do - commit.create_builds + commit.create_builds('master', false, nil) first_build = commit.builds.first second_build = commit.builds.last first_build.update(status: "success") diff --git a/spec/models/ci/project_services/mail_service_spec.rb b/spec/models/ci/project_services/mail_service_spec.rb index 0d9f85959ba..04e870dce7f 100644 --- a/spec/models/ci/project_services/mail_service_spec.rb +++ b/spec/models/ci/project_services/mail_service_spec.rb @@ -29,12 +29,13 @@ describe Ci::MailService do describe 'Sends email for' do let(:mail) { Ci::MailService.new } + let(:user) { User.new(notification_email: 'git@example.com')} describe 'failed build' do let(:project) { FactoryGirl.create(:ci_project, email_add_pusher: true) } let(:gl_project) { FactoryGirl.create(:empty_project, gitlab_ci_project: project) } let(:commit) { FactoryGirl.create(:ci_commit, gl_project: gl_project) } - let(:build) { FactoryGirl.create(:ci_build, status: :failed, commit: commit) } + let(:build) { FactoryGirl.create(:ci_build, status: :failed, commit: commit, user: user) } before do allow(mail).to receive_messages( @@ -57,7 +58,7 @@ describe Ci::MailService do let(:project) { FactoryGirl.create(:ci_project, email_add_pusher: true, email_only_broken_builds: false) } let(:gl_project) { FactoryGirl.create(:empty_project, gitlab_ci_project: project) } let(:commit) { FactoryGirl.create(:ci_commit, gl_project: gl_project) } - let(:build) { FactoryGirl.create(:ci_build, status: :success, commit: commit) } + let(:build) { FactoryGirl.create(:ci_build, status: :success, commit: commit, user: user) } before do allow(mail).to receive_messages( @@ -85,7 +86,7 @@ describe Ci::MailService do end let(:gl_project) { FactoryGirl.create(:empty_project, gitlab_ci_project: project) } let(:commit) { FactoryGirl.create(:ci_commit, gl_project: gl_project) } - let(:build) { FactoryGirl.create(:ci_build, status: :success, commit: commit) } + let(:build) { FactoryGirl.create(:ci_build, status: :success, commit: commit, user: user) } before do allow(mail).to receive_messages( @@ -114,7 +115,7 @@ describe Ci::MailService do end let(:gl_project) { FactoryGirl.create(:empty_project, gitlab_ci_project: project) } let(:commit) { FactoryGirl.create(:ci_commit, gl_project: gl_project) } - let(:build) { FactoryGirl.create(:ci_build, status: :success, commit: commit) } + let(:build) { FactoryGirl.create(:ci_build, status: :success, commit: commit, user: user) } before do allow(mail).to receive_messages( @@ -143,7 +144,7 @@ describe Ci::MailService do end let(:gl_project) { FactoryGirl.create(:empty_project, gitlab_ci_project: project) } let(:commit) { FactoryGirl.create(:ci_commit, gl_project: gl_project) } - let(:build) { FactoryGirl.create(:ci_build, status: :success, commit: commit) } + let(:build) { FactoryGirl.create(:ci_build, status: :success, commit: commit, user: user) } before do allow(mail).to receive_messages( @@ -166,7 +167,7 @@ describe Ci::MailService do end let(:gl_project) { FactoryGirl.create(:empty_project, gitlab_ci_project: project) } let(:commit) { FactoryGirl.create(:ci_commit, gl_project: gl_project) } - let(:build) { FactoryGirl.create(:ci_build, status: :failed, commit: commit) } + let(:build) { FactoryGirl.create(:ci_build, status: :failed, commit: commit, user: user) } before do allow(mail).to receive_messages( diff --git a/spec/models/ci/project_services/slack_message_spec.rb b/spec/models/ci/project_services/slack_message_spec.rb index 7b541802d7d..0870276c78f 100644 --- a/spec/models/ci/project_services/slack_message_spec.rb +++ b/spec/models/ci/project_services/slack_message_spec.rb @@ -7,7 +7,7 @@ describe Ci::SlackMessage do let(:commit) { FactoryGirl.create(:ci_commit_with_one_job) } let(:build) do - commit.create_builds + commit.create_builds('master', false, nil) commit.builds.first end @@ -47,7 +47,7 @@ describe Ci::SlackMessage do let(:color) { 'good' } it 'returns a message with success' do - commit.create_builds + commit.create_builds('master', false, nil) commit.builds.update_all(status: "success") commit.reload @@ -63,7 +63,7 @@ describe Ci::SlackMessage do let(:color) { 'danger' } it 'returns a message with information about failed build' do - commit.create_builds + commit.create_builds('master', false, nil) first_build = commit.builds.first second_build = commit.builds.last first_build.update(status: "success") |