diff options
author | Robert Speicher <rspeicher@gmail.com> | 2015-08-30 19:10:53 -0400 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2015-08-30 19:12:55 -0400 |
commit | 77053a6c217e06770a348ac989992afbd41697f6 (patch) | |
tree | 11df50675162be2045777c1f59c312d359e0d6cf /spec/models/commit_spec.rb | |
parent | 74b995d17b095e326177e7c0e452f0df3a1ab885 (diff) | |
download | gitlab-ci-rs-rspec3.tar.gz |
Convert to RSpec3 syntax via transpecrs-rspec3
Command:
transpec -c 'bundle exec rspec spec -t ~feature' \
-o should,oneliner,should_receive
Diffstat (limited to 'spec/models/commit_spec.rb')
-rw-r--r-- | spec/models/commit_spec.rb | 96 |
1 files changed, 48 insertions, 48 deletions
diff --git a/spec/models/commit_spec.rb b/spec/models/commit_spec.rb index f5b30f7..24b6520 100644 --- a/spec/models/commit_spec.rb +++ b/spec/models/commit_spec.rb @@ -23,16 +23,16 @@ describe Commit do let(:commit_with_project) { FactoryGirl.create :commit, project: project } let(:config_processor) { GitlabCiYamlProcessor.new(gitlab_ci_yaml) } - it { should belong_to(:project) } - it { should have_many(:builds) } - it { should validate_presence_of :before_sha } - it { should validate_presence_of :sha } - it { should validate_presence_of :ref } - it { should validate_presence_of :push_data } + it { is_expected.to belong_to(:project) } + it { is_expected.to have_many(:builds) } + it { is_expected.to validate_presence_of :before_sha } + it { is_expected.to validate_presence_of :sha } + it { is_expected.to validate_presence_of :ref } + it { is_expected.to validate_presence_of :push_data } - it { should respond_to :git_author_name } - it { should respond_to :git_author_email } - it { should respond_to :short_sha } + it { is_expected.to respond_to :git_author_name } + it { is_expected.to respond_to :git_author_email } + it { is_expected.to respond_to :short_sha } describe '#last_build' do subject { commit.last_build } @@ -41,8 +41,8 @@ describe Commit do @second = FactoryGirl.create :build, commit: commit end - it { should be_a(Build) } - it('returns with the most recently created build') { should eq(@second) } + it { is_expected.to be_a(Build) } + it('returns with the most recently created build') { is_expected.to eq(@second) } end describe '#retry' do @@ -68,7 +68,7 @@ describe Commit do commit = FactoryGirl.create :commit, project: project expected = 'commit_pusher_email' allow(commit).to receive(:push_data) { { user_email: expected } } - commit.project_recipients.should eq [expected] + expect(commit.project_recipients).to eq [expected] end it 'should return commit_pusher_email and additional recipients' do @@ -78,7 +78,7 @@ describe Commit do commit = FactoryGirl.create :commit, project: project expected = 'commit_pusher_email' allow(commit).to receive(:push_data) { { user_email: expected } } - commit.project_recipients.should eq ['rec1', 'rec2', expected] + expect(commit.project_recipients).to eq ['rec1', 'rec2', expected] end it 'should return recipients' do @@ -86,7 +86,7 @@ describe Commit do email_add_pusher: false, email_recipients: 'rec1 rec2' commit = FactoryGirl.create :commit, project: project - commit.project_recipients.should eq ['rec1', 'rec2'] + expect(commit.project_recipients).to eq ['rec1', 'rec2'] end it 'should return unique recipients only' do @@ -96,7 +96,7 @@ describe Commit do commit = FactoryGirl.create :commit, project: project expected = 'rec2' allow(commit).to receive(:push_data) { { user_email: expected } } - commit.project_recipients.should eq ['rec1', 'rec2'] + expect(commit.project_recipients).to eq ['rec1', 'rec2'] end end end @@ -108,7 +108,7 @@ describe Commit do commit.valid_commit_sha end - it('commit errors should not be empty') { commit.errors.should_not be_empty } + it('commit errors should not be empty') { expect(commit.errors).not_to be_empty } end end @@ -116,7 +116,7 @@ describe Commit do subject { commit_with_project.compare? } context 'if commit.before_sha are not nil' do - it { should be_truthy } + it { is_expected.to be_truthy } end end @@ -124,14 +124,14 @@ describe Commit do subject { commit.short_before_sha } it { expect(subject.length).to eq 8 } - it { commit.before_sha.should start_with(subject) } + it { expect(commit.before_sha).to start_with(subject) } end describe '#short_sha' do subject { commit.short_sha } it { expect(subject.length).to eq 8 } - it { commit.sha.should start_with(subject) } + it { expect(commit.sha).to start_with(subject) } end describe '#create_next_builds' do @@ -140,19 +140,19 @@ describe Commit do end it "creates builds for next type" do - commit.create_builds.should be_truthy + expect(commit.create_builds).to be_truthy commit.builds.reload - commit.builds.size.should eq 2 + expect(commit.builds.size).to eq 2 - commit.create_next_builds(nil).should be_truthy + expect(commit.create_next_builds(nil)).to be_truthy commit.builds.reload - commit.builds.size.should eq 4 + expect(commit.builds.size).to eq 4 - commit.create_next_builds(nil).should be_truthy + expect(commit.create_next_builds(nil)).to be_truthy commit.builds.reload - commit.builds.size.should eq 5 + expect(commit.builds.size).to eq 5 - commit.create_next_builds(nil).should be_falsey + expect(commit.create_next_builds(nil)).to be_falsey end end @@ -162,9 +162,9 @@ describe Commit do end it 'creates builds' do - commit.create_builds.should be_truthy + expect(commit.create_builds).to be_truthy commit.builds.reload - commit.builds.size.should eq 2 + expect(commit.builds.size).to eq 2 end context 'for build triggers' do @@ -172,29 +172,29 @@ describe Commit do let(:trigger_request) { FactoryGirl.create :trigger_request, commit: commit, trigger: trigger } it 'creates builds' do - commit.create_builds(trigger_request).should be_truthy + expect(commit.create_builds(trigger_request)).to be_truthy commit.builds.reload - commit.builds.size.should eq 2 + expect(commit.builds.size).to eq 2 end it 'rebuilds commit' do - commit.create_builds.should be_truthy + expect(commit.create_builds).to be_truthy commit.builds.reload - commit.builds.size.should eq 2 + expect(commit.builds.size).to eq 2 - commit.create_builds(trigger_request).should be_truthy + expect(commit.create_builds(trigger_request)).to be_truthy commit.builds.reload - commit.builds.size.should eq 4 + expect(commit.builds.size).to eq 4 end it 'creates next builds' do - commit.create_builds(trigger_request).should be_truthy + expect(commit.create_builds(trigger_request)).to be_truthy commit.builds.reload - commit.builds.size.should eq 2 + expect(commit.builds.size).to eq 2 - commit.create_next_builds(trigger_request).should be_truthy + expect(commit.create_next_builds(trigger_request)).to be_truthy commit.builds.reload - commit.builds.size.should eq 4 + expect(commit.builds.size).to eq 4 end context 'for [ci skip]' do @@ -204,11 +204,11 @@ describe Commit do end it 'rebuilds commit' do - commit.status.should eq 'skipped' - commit.create_builds(trigger_request).should be_truthy + expect(commit.status).to eq 'skipped' + expect(commit.create_builds(trigger_request)).to be_truthy commit.builds.reload - commit.builds.size.should eq 2 - commit.status.should eq 'pending' + expect(commit.builds.size).to eq 2 + expect(commit.status).to eq 'pending' end end end @@ -222,13 +222,13 @@ describe Commit do build = FactoryGirl.create :build, commit: commit, finished_at: Time.now - 60 build1 = FactoryGirl.create :build, commit: commit, finished_at: Time.now - 120 - commit.finished_at.to_i.should eq build.finished_at.to_i + expect(commit.finished_at.to_i).to eq build.finished_at.to_i end it "returns nil if there is no finished build" do build = FactoryGirl.create :not_started_build, commit: commit - commit.finished_at.should be_nil + expect(commit.finished_at).to be_nil end end @@ -239,26 +239,26 @@ describe Commit do it "calculates average when there are two builds with coverage" do FactoryGirl.create :build, name: "rspec", coverage: 30, commit: commit FactoryGirl.create :build, name: "rubocop", coverage: 40, commit: commit - commit.coverage.should eq "35.00" + expect(commit.coverage).to eq "35.00" end it "calculates average when there are two builds with coverage and one with nil" do FactoryGirl.create :build, name: "rspec", coverage: 30, commit: commit FactoryGirl.create :build, name: "rubocop", coverage: 40, commit: commit FactoryGirl.create :build, commit: commit - commit.coverage.should eq "35.00" + expect(commit.coverage).to eq "35.00" end it "calculates average when there are two builds with coverage and one is retried" do FactoryGirl.create :build, name: "rspec", coverage: 30, commit: commit FactoryGirl.create :build, name: "rubocop", coverage: 30, commit: commit FactoryGirl.create :build, name: "rubocop", coverage: 40, commit: commit - commit.coverage.should eq "35.00" + expect(commit.coverage).to eq "35.00" end it "calculates average when there is one build without coverage" do FactoryGirl.create :build, commit: commit - commit.coverage.should be_nil + expect(commit.coverage).to be_nil end end end |