Convert to RSpec3 syntax via transpecrs-rspec3

Command:

    transpec -c 'bundle exec rspec spec -t ~feature' \
    -o should,oneliner,should_receive

14 files changed, 202 insertions, 202 deletions

diff --git a/spec/models/build_spec.rb b/spec/models/build_spec.rb
index 04f0f0f..cb080d2 100644
--- a/spec/models/build_spec.rb
+++ b/spec/models/build_spec.rb
@@ -30,14 +30,14 @@ describe Build do
   let(:commit) { FactoryGirl.create :commit, project: project }
   let(:build) { FactoryGirl.create :build, commit: commit }
 
-  it { should belong_to(:commit) }
-  it { should validate_presence_of :status }
+  it { is_expected.to belong_to(:commit) }
+  it { is_expected.to validate_presence_of :status }
 
-  it { should respond_to :success? }
-  it { should respond_to :failed? }
-  it { should respond_to :running? }
-  it { should respond_to :pending? }
-  it { should respond_to :trace_html }
+  it { is_expected.to respond_to :success? }
+  it { is_expected.to respond_to :failed? }
+  it { is_expected.to respond_to :running? }
+  it { is_expected.to respond_to :pending? }
+  it { is_expected.to respond_to :trace_html }
 
   describe '.first_pending' do
     let(:first) { FactoryGirl.create :build, commit: commit, status: 'pending', created_at: Date.yesterday }
@@ -45,8 +45,8 @@ describe Build do
     before { first; second }
     subject { Build.first_pending }
 
-    it { should be_a(Build) }
-    it('returns with the first pending build') { should eq(first) }
+    it { is_expected.to be_a(Build) }
+    it('returns with the first pending build') { is_expected.to eq(first) }
   end
 
   describe '.create_from' do
@@ -69,14 +69,14 @@ describe Build do
     context 'without started_at' do
       before { build.started_at = nil }
 
-      it { should be_falsey }
+      it { is_expected.to be_falsey }
     end
 
     %w(running success failed).each do |status|
       context "if build status is #{status}" do
         before { build.status = status }
 
-        it { should be_truthy }
+        it { is_expected.to be_truthy }
       end
     end
 
@@ -84,7 +84,7 @@ describe Build do
       context "if build status is #{status}" do
         before { build.status = status }
 
-        it { should be_falsey }
+        it { is_expected.to be_falsey }
       end
     end
   end
@@ -96,7 +96,7 @@ describe Build do
       context "if build.status is #{state}" do
         before { build.status = state }
 
-        it { should be_truthy }
+        it { is_expected.to be_truthy }
       end
     end
 
@@ -104,7 +104,7 @@ describe Build do
       context "if build.status is #{state}" do
         before { build.status = state }
 
-        it { should be_falsey }
+        it { is_expected.to be_falsey }
       end
     end
   end
@@ -116,7 +116,7 @@ describe Build do
       context "if build.status is #{state}" do
         before { build.status = state }
 
-        it { should be_truthy }
+        it { is_expected.to be_truthy }
       end
     end
 
@@ -124,7 +124,7 @@ describe Build do
       context "if build.status is #{state}" do
         before { build.status = state }
 
-        it { should be_falsey }
+        it { is_expected.to be_falsey }
       end
     end
   end
@@ -138,13 +138,13 @@ describe Build do
       context 'and build.status is success' do
         before { build.status = 'success' }
 
-        it { should be_falsey }
+        it { is_expected.to be_falsey }
       end
 
       context 'and build.status is failed' do
         before { build.status = 'failed' }
 
-        it { should be_falsey }
+        it { is_expected.to be_falsey }
       end
     end
 
@@ -154,13 +154,13 @@ describe Build do
       context 'and build.status is success' do
         before { build.status = 'success' }
 
-        it { should be_falsey }
+        it { is_expected.to be_falsey }
       end
 
       context 'and build.status is failed' do
         before { build.status = 'failed' }
 
-        it { should be_truthy }
+        it { is_expected.to be_truthy }
       end
     end
   end
@@ -168,13 +168,13 @@ describe Build do
   describe '#trace' do
     subject { build.trace_html }
 
-    it { should be_empty }
+    it { is_expected.to be_empty }
 
     context 'if build.trace contains text' do
       let(:text) { 'example output' }
       before { build.trace = text }
 
-      it { should include(text) }
+      it { is_expected.to include(text) }
       it { expect(subject.length).to be >= text.length }
     end
   end
@@ -182,13 +182,13 @@ describe Build do
   describe '#timeout' do
     subject { build.timeout }
 
-    it { should eq(commit.project.timeout) }
+    it { is_expected.to eq(commit.project.timeout) }
   end
 
   describe '#duration' do
     subject { build.duration }
 
-    it { should eq(120.0) }
+    it { is_expected.to eq(120.0) }
 
     context 'if the building process has not started yet' do
       before do
@@ -196,7 +196,7 @@ describe Build do
         build.finished_at = nil
       end
 
-      it { should be_nil }
+      it { is_expected.to be_nil }
     end
 
     context 'if the building process has started' do
@@ -205,8 +205,8 @@ describe Build do
         build.finished_at = nil
       end
 
-      it { should be_a(Float) }
-      it { should > 0.0 }
+      it { is_expected.to be_a(Float) }
+      it { is_expected.to be > 0.0 }
     end
   end
 
@@ -221,86 +221,86 @@ describe Build do
     }
 
     subject { build.options }
-    it { should eq(options) }
+    it { is_expected.to eq(options) }
   end
 
   describe '#ref' do
     subject { build.ref }
 
-    it { should eq(commit.ref) }
+    it { is_expected.to eq(commit.ref) }
   end
 
   describe '#sha' do
     subject { build.sha }
 
-    it { should eq(commit.sha) }
+    it { is_expected.to eq(commit.sha) }
   end
 
   describe '#short_sha' do
     subject { build.short_sha }
 
-    it { should eq(commit.short_sha) }
+    it { is_expected.to eq(commit.short_sha) }
   end
 
   describe '#before_sha' do
     subject { build.before_sha }
 
-    it { should eq(commit.before_sha) }
+    it { is_expected.to eq(commit.before_sha) }
   end
 
   describe '#allow_git_fetch' do
     subject { build.allow_git_fetch }
 
-    it { should eq(project.allow_git_fetch) }
+    it { is_expected.to eq(project.allow_git_fetch) }
   end
 
   describe '#project' do
     subject { build.project }
 
-    it { should eq(commit.project) }
+    it { is_expected.to eq(commit.project) }
   end
 
   describe '#project_id' do
     subject { build.project_id }
 
-    it { should eq(commit.project_id) }
+    it { is_expected.to eq(commit.project_id) }
   end
 
   describe '#project_name' do
     subject { build.project_name }
 
-    it { should eq(project.name) }
+    it { is_expected.to eq(project.name) }
   end
 
   describe '#repo_url' do
     subject { build.repo_url }
 
-    it { should eq(project.repo_url_with_auth) }
+    it { is_expected.to eq(project.repo_url_with_auth) }
   end
 
   describe '#extract_coverage' do
     context 'valid content & regex' do
       subject { build.extract_coverage('Coverage 1033 / 1051 LOC (98.29%) covered', '\(\d+.\d+\%\) covered') }
 
-      it { should eq(98.29) }
+      it { is_expected.to eq(98.29) }
     end
 
     context 'valid content & bad regex' do
       subject { build.extract_coverage('Coverage 1033 / 1051 LOC (98.29%) covered', 'very covered') }
 
-      it { should be_nil }
+      it { is_expected.to be_nil }
     end
 
     context 'no coverage content & regex' do
       subject { build.extract_coverage('No coverage for today :sad:', '\(\d+.\d+\%\) covered') }
 
-      it { should be_nil }
+      it { is_expected.to be_nil }
     end
 
     context 'multiple results in content & regex' do
       subject { build.extract_coverage(' (98.39%) covered. (98.29%) covered', '\(\d+.\d+\%\) covered') }
 
-      it { should eq(98.29) }
+      it { is_expected.to eq(98.29) }
     end
   end
 
@@ -314,7 +314,7 @@ describe Build do
         ]
       }
 
-      it { should eq(variables) }
+      it { is_expected.to eq(variables) }
 
       context 'and secure variables' do
         let(:secure_variables) {
@@ -327,7 +327,7 @@ describe Build do
           build.project.variables << Variable.new(key: 'SECRET_KEY', value: 'secret_value')
         end
 
-        it { should eq(variables + secure_variables) }
+        it { is_expected.to eq(variables + secure_variables) }
 
         context 'and trigger variables' do
           let(:trigger) { FactoryGirl.create :trigger, project: project }
@@ -342,7 +342,7 @@ describe Build do
             build.trigger_request = trigger_request
           end
 
-          it { should eq(variables + secure_variables + trigger_variables) }
+          it { is_expected.to eq(variables + secure_variables + trigger_variables) }
         end
       end
     end
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
diff --git a/spec/models/mail_service_spec.rb b/spec/models/mail_service_spec.rb
index 3fccc63..27803aa 100644
--- a/spec/models/mail_service_spec.rb
+++ b/spec/models/mail_service_spec.rb
@@ -16,7 +16,7 @@ require 'spec_helper'
 
 describe MailService do
   describe "Associations" do
-    it { should belong_to :project }
+    it { is_expected.to belong_to :project }
   end
 
   describe "Validations" do
@@ -45,8 +45,8 @@ describe MailService do
       end
 
       def should_email(email)
-        Notify.should_receive(:build_fail_email).with(build.id, email)
-        Notify.should_not_receive(:build_success_email).with(build.id, email)
+        expect(Notify).to receive(:build_fail_email).with(build.id, email)
+        expect(Notify).not_to receive(:build_success_email).with(build.id, email)
       end
     end
 
@@ -65,8 +65,8 @@ describe MailService do
       end
 
       def should_email(email)
-        Notify.should_receive(:build_success_email).with(build.id, email)
-        Notify.should_not_receive(:build_fail_email).with(build.id, email)
+        expect(Notify).to receive(:build_success_email).with(build.id, email)
+        expect(Notify).not_to receive(:build_fail_email).with(build.id, email)
       end
     end
 
@@ -91,8 +91,8 @@ describe MailService do
       end
 
       def should_email(email)
-        Notify.should_receive(:build_success_email).with(build.id, email)
-        Notify.should_not_receive(:build_fail_email).with(build.id, email)
+        expect(Notify).to receive(:build_success_email).with(build.id, email)
+        expect(Notify).not_to receive(:build_fail_email).with(build.id, email)
       end
     end
 
@@ -117,8 +117,8 @@ describe MailService do
       end
 
       def should_email(email)
-        Notify.should_not_receive(:build_success_email).with(build.id, email)
-        Notify.should_not_receive(:build_fail_email).with(build.id, email)
+        expect(Notify).not_to receive(:build_success_email).with(build.id, email)
+        expect(Notify).not_to receive(:build_fail_email).with(build.id, email)
       end
     end
 
@@ -138,7 +138,7 @@ describe MailService do
       end
 
       it do
-        mail.can_test?.should eq true
+        expect(mail.can_test?).to eq true
       end
     end
 
@@ -164,8 +164,8 @@ describe MailService do
       end
 
       def should_email(email)
-        Notify.should_not_receive(:build_success_email).with(build.id, email)
-        Notify.should_not_receive(:build_fail_email).with(build.id, email)
+        expect(Notify).not_to receive(:build_success_email).with(build.id, email)
+        expect(Notify).not_to receive(:build_fail_email).with(build.id, email)
       end
     end
   end
diff --git a/spec/models/network_spec.rb b/spec/models/network_spec.rb
index 3eac46c..9c40e32 100644
--- a/spec/models/network_spec.rb
+++ b/spec/models/network_spec.rb
@@ -13,7 +13,7 @@ describe Network do
         allow(network.class).to receive(:put) { response }
       end
 
-      it { should be_truthy }
+      it { is_expected.to be_truthy }
     end
 
     context 'on failure' do
@@ -23,7 +23,7 @@ describe Network do
         allow(network.class).to receive(:put) { response }
       end
 
-      it { should be_nil }
+      it { is_expected.to be_nil }
     end
   end
 
@@ -39,7 +39,7 @@ describe Network do
         allow(network.class).to receive(:delete) { response }
       end
 
-      it { should equal(parsed_response) }
+      it { is_expected.to equal(parsed_response) }
     end
 
     context 'on failure' do
@@ -48,7 +48,7 @@ describe Network do
         allow(network.class).to receive(:delete) { response }
       end
 
-      it { should be_nil }
+      it { is_expected.to be_nil }
     end
   end
 end
diff --git a/spec/models/project_services/hip_chat_service_spec.rb b/spec/models/project_services/hip_chat_service_spec.rb
index baaecfd..71cdf4f 100644
--- a/spec/models/project_services/hip_chat_service_spec.rb
+++ b/spec/models/project_services/hip_chat_service_spec.rb
@@ -24,8 +24,8 @@ describe HipChatService do
         subject.active = true
       end
 
-      it { should validate_presence_of :hipchat_room }
-      it { should validate_presence_of :hipchat_token }
+      it { is_expected.to validate_presence_of :hipchat_room }
+      it { is_expected.to validate_presence_of :hipchat_token }
 
     end
   end
diff --git a/spec/models/project_services/slack_message_spec.rb b/spec/models/project_services/slack_message_spec.rb
index fdbe340..6bfdd48 100644
--- a/spec/models/project_services/slack_message_spec.rb
+++ b/spec/models/project_services/slack_message_spec.rb
@@ -19,11 +19,11 @@ describe SlackMessage do
       it 'returns a message with succeeded build' do
         build.update(status: "success")
 
-        subject.color.should eq color
-        subject.fallback.should include('Build')
-        subject.fallback.should include("\##{build.id}")
-        subject.fallback.should include('succeeded')
-        subject.attachments.first[:fields].should be_empty
+        expect(subject.color).to eq color
+        expect(subject.fallback).to include('Build')
+        expect(subject.fallback).to include("\##{build.id}")
+        expect(subject.fallback).to include('succeeded')
+        expect(subject.attachments.first[:fields]).to be_empty
       end
     end
 
@@ -33,11 +33,11 @@ describe SlackMessage do
       it 'returns a message with failed build' do
         build.update(status: "failed")
 
-        subject.color.should eq color
-        subject.fallback.should include('Build')
-        subject.fallback.should include("\##{build.id}")
-        subject.fallback.should include('failed')
-        subject.attachments.first[:fields].should be_empty
+        expect(subject.color).to eq color
+        expect(subject.fallback).to include('Build')
+        expect(subject.fallback).to include("\##{build.id}")
+        expect(subject.fallback).to include('failed')
+        expect(subject.attachments.first[:fields]).to be_empty
       end
     end
   end
@@ -53,11 +53,11 @@ describe SlackMessage do
         commit.builds.update_all(status: "success")
         commit.reload
 
-        subject.color.should eq color
-        subject.fallback.should include('Commit')
-        subject.fallback.should include("\##{commit.id}")
-        subject.fallback.should include('succeeded')
-        subject.attachments.first[:fields].should be_empty
+        expect(subject.color).to eq color
+        expect(subject.fallback).to include('Commit')
+        expect(subject.fallback).to include("\##{commit.id}")
+        expect(subject.fallback).to include('succeeded')
+        expect(subject.attachments.first[:fields]).to be_empty
       end
     end
 
@@ -71,13 +71,13 @@ describe SlackMessage do
         first_build.update(status: "success")
         second_build.update(status: "failed")
         
-        subject.color.should eq color
-        subject.fallback.should include('Commit')
-        subject.fallback.should include("\##{commit.id}")
-        subject.fallback.should include('failed')
-        subject.attachments.first[:fields].size.should eq 1
-        subject.attachments.first[:fields].first[:title].should eq second_build.name
-        subject.attachments.first[:fields].first[:value].should include("\##{second_build.id}")
+        expect(subject.color).to eq color
+        expect(subject.fallback).to include('Commit')
+        expect(subject.fallback).to include("\##{commit.id}")
+        expect(subject.fallback).to include('failed')
+        expect(subject.attachments.first[:fields].size).to eq 1
+        expect(subject.attachments.first[:fields].first[:title]).to eq second_build.name
+        expect(subject.attachments.first[:fields].first[:value]).to include("\##{second_build.id}")
       end
     end
   end
diff --git a/spec/models/project_services/slack_service_spec.rb b/spec/models/project_services/slack_service_spec.rb
index 80d7c07..2a00415 100644
--- a/spec/models/project_services/slack_service_spec.rb
+++ b/spec/models/project_services/slack_service_spec.rb
@@ -16,7 +16,7 @@ require 'spec_helper'
 
 describe SlackService do
   describe "Associations" do
-    it { should belong_to :project }
+    it { is_expected.to belong_to :project }
   end
 
   describe "Validations" do
@@ -25,7 +25,7 @@ describe SlackService do
         subject.active = true
       end
 
-      it { should validate_presence_of :webhook }
+      it { is_expected.to validate_presence_of :webhook }
     end
   end
 
@@ -52,7 +52,7 @@ describe SlackService do
       slack.execute(build)
       SlackNotifierWorker.drain
 
-      WebMock.should have_requested(:post, webhook_url).once
+      expect(WebMock).to have_requested(:post, webhook_url).once
     end
   end
 end
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index ec30fa8..cc6a900 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -30,21 +30,21 @@ require 'spec_helper'
 describe Project do
   subject { FactoryGirl.build :project }
 
-  it { should have_many(:commits) }
+  it { is_expected.to have_many(:commits) }
 
-  it { should validate_presence_of :name }
-  it { should validate_presence_of :timeout }
-  it { should validate_presence_of :default_ref }
+  it { is_expected.to validate_presence_of :name }
+  it { is_expected.to validate_presence_of :timeout }
+  it { is_expected.to validate_presence_of :default_ref }
 
   describe 'before_validation' do
     it 'should set an random token if none provided' do
       project = FactoryGirl.create :project_without_token
-      project.token.should_not eq ""
+      expect(project.token).not_to eq ""
     end
 
     it 'should not set an random toke if one provided' do
       project = FactoryGirl.create :project
-      project.token.should eq "iPWx6WM4lhHNedGfBpPJNP"
+      expect(project.token).to eq "iPWx6WM4lhHNedGfBpPJNP"
     end
   end
 
@@ -57,7 +57,7 @@ describe Project do
       FactoryGirl.create :commit, committed_at: 1.hour.ago, project: newest_project
       FactoryGirl.create :commit, committed_at: 2.hour.ago, project: oldest_project
 
-      described_class.ordered_by_last_commit_date.should eq [newest_project, oldest_project, project_without_commits]
+      expect(described_class.ordered_by_last_commit_date).to eq [newest_project, oldest_project, project_without_commits]
     end
   end
 
@@ -70,26 +70,26 @@ describe Project do
         FactoryGirl.create(:build, commit: commit)
       end
 
-      it { project.status.should eq 'pending' }
-      it { project.last_commit.should be_kind_of(Commit)  }
-      it { project.human_status.should eq 'pending' }
+      it { expect(project.status).to eq 'pending' }
+      it { expect(project.last_commit).to be_kind_of(Commit)  }
+      it { expect(project.human_status).to eq 'pending' }
     end
   end
 
   describe '#email_notification?' do
     it do
       project = FactoryGirl.create :project, email_add_pusher: true
-      project.email_notification?.should eq true
+      expect(project.email_notification?).to eq true
     end
 
     it do
       project = FactoryGirl.create :project, email_add_pusher: false, email_recipients: 'test tesft'
-      project.email_notification?.should eq true
+      expect(project.email_notification?).to eq true
     end
 
     it do
       project = FactoryGirl.create :project, email_add_pusher: false, email_recipients: ''
-      project.email_notification?.should eq false
+      expect(project.email_notification?).to eq false
     end
   end
 
@@ -98,28 +98,28 @@ describe Project do
       project = FactoryGirl.create :project, email_add_pusher: true
       allow(project).to receive(:broken?).and_return(true)
       allow(project).to receive(:success?).and_return(true)
-      project.broken_or_success?.should eq true
+      expect(project.broken_or_success?).to eq true
     }
 
     it {
       project = FactoryGirl.create :project, email_add_pusher: true
       allow(project).to receive(:broken?).and_return(true)
       allow(project).to receive(:success?).and_return(false)
-      project.broken_or_success?.should eq true
+      expect(project.broken_or_success?).to eq true
     }
 
     it {
       project = FactoryGirl.create :project, email_add_pusher: true
       allow(project).to receive(:broken?).and_return(false)
       allow(project).to receive(:success?).and_return(true)
-      project.broken_or_success?.should eq true
+      expect(project.broken_or_success?).to eq true
     }
 
     it {
       project = FactoryGirl.create :project, email_add_pusher: true
       allow(project).to receive(:broken?).and_return(false)
       allow(project).to receive(:success?).and_return(false)
-      project.broken_or_success?.should eq false
+      expect(project.broken_or_success?).to eq false
     }
   end
 
@@ -128,14 +128,14 @@ describe Project do
     let(:parsed_project) { described_class.parse(project_dump) }
 
     
-    it { parsed_project.should be_valid }
-    it { parsed_project.should be_kind_of(described_class) }
-    it { parsed_project.name.should eq("GitLab / api.gitlab.org") }
-    it { parsed_project.gitlab_id.should eq(189) }
-    it { parsed_project.gitlab_url.should eq("http://demo.gitlab.com/gitlab/api-gitlab-org") }
+    it { expect(parsed_project).to be_valid }
+    it { expect(parsed_project).to be_kind_of(described_class) }
+    it { expect(parsed_project.name).to eq("GitLab / api.gitlab.org") }
+    it { expect(parsed_project.gitlab_id).to eq(189) }
+    it { expect(parsed_project.gitlab_url).to eq("http://demo.gitlab.com/gitlab/api-gitlab-org") }
 
     it "parses plain hash" do
-      described_class.parse(project_dump).name.should eq("GitLab / api.gitlab.org")
+      expect(described_class.parse(project_dump).name).to eq("GitLab / api.gitlab.org")
     end
   end
 
@@ -143,43 +143,43 @@ describe Project do
     let(:project) { FactoryGirl.create :project }
     subject { project.repo_url_with_auth }
 
-    it { should be_a(String) }
-    it { should end_with(".git") }
-    it { should start_with(project.gitlab_url[0..6]) }
-    it { should include(project.token) }
-    it { should include('gitlab-ci-token') }
-    it { should include(project.gitlab_url[7..-1]) }
+    it { is_expected.to be_a(String) }
+    it { is_expected.to end_with(".git") }
+    it { is_expected.to start_with(project.gitlab_url[0..6]) }
+    it { is_expected.to include(project.token) }
+    it { is_expected.to include('gitlab-ci-token') }
+    it { is_expected.to include(project.gitlab_url[7..-1]) }
   end
 
   describe '.search' do
     let!(:project) { FactoryGirl.create(:project, name: "foo") }
 
-    it { described_class.search('fo').should include(project) }
-    it { described_class.search('bar').should be_empty }
+    it { expect(described_class.search('fo')).to include(project) }
+    it { expect(described_class.search('bar')).to be_empty }
   end
 
   describe '#any_runners' do
     it "there are no runners available" do
       project = FactoryGirl.create(:project)
-      project.any_runners?.should be_falsey
+      expect(project.any_runners?).to be_falsey
     end
 
     it "there is a specific runner" do
       project = FactoryGirl.create(:project)
       project.runners << FactoryGirl.create(:specific_runner)
-      project.any_runners?.should be_truthy
+      expect(project.any_runners?).to be_truthy
     end
 
     it "there is a shared runner" do
       project = FactoryGirl.create(:project, shared_runners_enabled: true)
       FactoryGirl.create(:shared_runner)
-      project.any_runners?.should be_truthy
+      expect(project.any_runners?).to be_truthy
     end
 
     it "there is a shared runner, but they are prohibited to use" do
       project = FactoryGirl.create(:project)
       FactoryGirl.create(:shared_runner)
-      project.any_runners?.should be_falsey
+      expect(project.any_runners?).to be_falsey
     end
   end
 end
diff --git a/spec/models/runner_spec.rb b/spec/models/runner_spec.rb
index 0621a95..650b3a1 100644
--- a/spec/models/runner_spec.rb
+++ b/spec/models/runner_spec.rb
@@ -43,9 +43,9 @@ describe Runner do
 
     before { shared_runner.assign_to(project) }
 
-    it { shared_runner.should be_specific }
-    it { shared_runner.projects.should eq [project] }
-    it { shared_runner.only_for?(project).should be_truthy }
+    it { expect(shared_runner).to be_specific }
+    it { expect(shared_runner.projects).to eq [project] }
+    it { expect(shared_runner.only_for?(project)).to be_truthy }
   end
 
   describe "belongs_to_one_project?" do
@@ -56,7 +56,7 @@ describe Runner do
       project.runners << runner
       project1.runners << runner
 
-      runner.belongs_to_one_project?.should be_falsey
+      expect(runner.belongs_to_one_project?).to be_falsey
     end
 
     it "returns true" do
@@ -64,7 +64,7 @@ describe Runner do
       project = FactoryGirl.create(:project)
       project.runners << runner
 
-      runner.belongs_to_one_project?.should be_truthy
+      expect(runner.belongs_to_one_project?).to be_truthy
     end
   end
 end
diff --git a/spec/models/service_spec.rb b/spec/models/service_spec.rb
index 7380c81..7d10551 100644
--- a/spec/models/service_spec.rb
+++ b/spec/models/service_spec.rb
@@ -17,7 +17,7 @@ require 'spec_helper'
 describe Service do
 
   describe "Associations" do
-    it { should belong_to :project }
+    it { is_expected.to belong_to :project }
   end
 
   describe "Mass assignment" do
@@ -40,7 +40,7 @@ describe Service do
       end
 
       describe '#can_test' do
-        it { @testable.should eq true }
+        it { expect(@testable).to eq true }
       end
     end
   end
diff --git a/spec/models/trigger_spec.rb b/spec/models/trigger_spec.rb
index 6c327ec..4d58a4c 100644
--- a/spec/models/trigger_spec.rb
+++ b/spec/models/trigger_spec.rb
@@ -6,12 +6,12 @@ describe Trigger do
   describe 'before_validation' do
     it 'should set an random token if none provided' do
       trigger = FactoryGirl.create :trigger_without_token, project: project
-      trigger.token.should_not be_nil
+      expect(trigger.token).not_to be_nil
     end
 
     it 'should not set an random token if one provided' do
       trigger = FactoryGirl.create :trigger, project: project
-      trigger.token.should eq 'token'
+      expect(trigger.token).to eq 'token'
     end
   end
 end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 9989e3d..affd2cb 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -42,13 +42,13 @@ describe User do
     it "returns false for reporter" do
       allow(@user).to receive(:project_info).and_return(project_with_reporter_access)
 
-      @user.has_developer_access?(1).should be_falsey
+      expect(@user.has_developer_access?(1)).to be_falsey
     end
 
     it "returns true for owner" do
       allow(@user).to receive(:project_info).and_return(project_with_owner_access)
 
-      @user.has_developer_access?(1).should be_truthy
+      expect(@user.has_developer_access?(1)).to be_truthy
     end
   end
 
@@ -66,13 +66,13 @@ describe User do
     it "returns projects" do
       allow_any_instance_of(described_class).to receive(:can_manage_project?).and_return(true)
 
-      user.authorized_projects.count.should eq 2
+      expect(user.authorized_projects.count).to eq 2
     end
 
     it "empty list if user miss manage permission" do
       allow_any_instance_of(described_class).to receive(:can_manage_project?).and_return(false)
 
-      user.authorized_projects.count.should eq 0
+      expect(user.authorized_projects.count).to eq 0
     end
   end
 
@@ -93,8 +93,8 @@ describe User do
       project.runners << runner
       project1.runners << runner1
 
-      user.authorized_runners.should include(runner, runner1)
-      user.authorized_runners.should_not include(runner2)
+      expect(user.authorized_runners).to include(runner, runner1)
+      expect(user.authorized_runners).not_to include(runner2)
     end
   end
 end
diff --git a/spec/models/variable_spec.rb b/spec/models/variable_spec.rb
index c089df9..a41ba4e 100644
--- a/spec/models/variable_spec.rb
+++ b/spec/models/variable_spec.rb
@@ -24,15 +24,15 @@ describe Variable do
 
   describe '#value' do
     it 'stores the encrypted value' do
-      subject.encrypted_value.should_not be_nil
+      expect(subject.encrypted_value).not_to be_nil
     end
 
     it 'stores an iv for value' do
-      subject.encrypted_value_iv.should_not be_nil
+      expect(subject.encrypted_value_iv).not_to be_nil
     end
 
     it 'stores a salt for value' do
-      subject.encrypted_value_salt.should_not be_nil
+      expect(subject.encrypted_value_salt).not_to be_nil
     end
 
     it 'fails to decrypt if iv is incorrect' do
diff --git a/spec/models/web_hook_spec.rb b/spec/models/web_hook_spec.rb
index 100d9a9..735440e 100644
--- a/spec/models/web_hook_spec.rb
+++ b/spec/models/web_hook_spec.rb
@@ -13,22 +13,22 @@ require 'spec_helper'
 
 describe WebHook do
   describe "Associations" do
-    it { should belong_to :project }
+    it { is_expected.to belong_to :project }
   end
 
   describe "Validations" do
-    it { should validate_presence_of(:url) }
+    it { is_expected.to validate_presence_of(:url) }
 
     context "url format" do
-      it { should allow_value("http://example.com").for(:url) }
-      it { should allow_value("https://excample.com").for(:url) }
-      it { should allow_value("http://test.com/api").for(:url) }
-      it { should allow_value("http://test.com/api?key=abc").for(:url) }
-      it { should allow_value("http://test.com/api?key=abc&type=def").for(:url) }
-
-      it { should_not allow_value("example.com").for(:url) }
-      it { should_not allow_value("ftp://example.com").for(:url) }
-      it { should_not allow_value("herp-and-derp").for(:url) }
+      it { is_expected.to allow_value("http://example.com").for(:url) }
+      it { is_expected.to allow_value("https://excample.com").for(:url) }
+      it { is_expected.to allow_value("http://test.com/api").for(:url) }
+      it { is_expected.to allow_value("http://test.com/api?key=abc").for(:url) }
+      it { is_expected.to allow_value("http://test.com/api?key=abc&type=def").for(:url) }
+
+      it { is_expected.not_to allow_value("example.com").for(:url) }
+      it { is_expected.not_to allow_value("ftp://example.com").for(:url) }
+      it { is_expected.not_to allow_value("herp-and-derp").for(:url) }
     end
   end
 
@@ -43,18 +43,18 @@ describe WebHook do
 
     it "POSTs to the web hook URL" do
       @web_hook.execute(@data)
-      WebMock.should have_requested(:post, @web_hook.url).once
+      expect(WebMock).to have_requested(:post, @web_hook.url).once
     end
 
     it "POSTs the data as JSON" do
       json = @data.to_json
 
       @web_hook.execute(@data)
-      WebMock.should have_requested(:post, @web_hook.url).with(body: json).once
+      expect(WebMock).to have_requested(:post, @web_hook.url).with(body: json).once
     end
 
     it "catches exceptions" do
-      described_class.should_receive(:post).and_raise("Some HTTP Post error")
+      expect(described_class).to receive(:post).and_raise("Some HTTP Post error")
 
       expect { @web_hook.execute(@data) }.
         to raise_error(RuntimeError, 'Some HTTP Post error')