Updated rspec to rspec 3.x syntax

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>

22 files changed, 266 insertions, 264 deletions

diff --git a/spec/services/event_create_service_spec.rb b/spec/services/event_create_service_spec.rb
index 713aa3e7e74..007a9eed192 100644
--- a/spec/services/event_create_service_spec.rb
+++ b/spec/services/event_create_service_spec.rb
@@ -7,7 +7,7 @@ describe EventCreateService do
     describe :open_issue do
       let(:issue) { create(:issue) }
 
-      it { service.open_issue(issue, issue.author).should be_true }
+      it { expect(service.open_issue(issue, issue.author)).to be_truthy }
 
       it "should create new event" do
         expect { service.open_issue(issue, issue.author) }.to change { Event.count }
@@ -17,7 +17,7 @@ describe EventCreateService do
     describe :close_issue do
       let(:issue) { create(:issue) }
 
-      it { service.close_issue(issue, issue.author).should be_true }
+      it { expect(service.close_issue(issue, issue.author)).to be_truthy }
 
       it "should create new event" do
         expect { service.close_issue(issue, issue.author) }.to change { Event.count }
@@ -27,7 +27,7 @@ describe EventCreateService do
     describe :reopen_issue do
       let(:issue) { create(:issue) }
 
-      it { service.reopen_issue(issue, issue.author).should be_true }
+      it { expect(service.reopen_issue(issue, issue.author)).to be_truthy }
 
       it "should create new event" do
         expect { service.reopen_issue(issue, issue.author) }.to change { Event.count }
@@ -39,7 +39,7 @@ describe EventCreateService do
     describe :open_mr do
       let(:merge_request) { create(:merge_request) }
 
-      it { service.open_mr(merge_request, merge_request.author).should be_true }
+      it { expect(service.open_mr(merge_request, merge_request.author)).to be_truthy }
 
       it "should create new event" do
         expect { service.open_mr(merge_request, merge_request.author) }.to change { Event.count }
@@ -49,7 +49,7 @@ describe EventCreateService do
     describe :close_mr do
       let(:merge_request) { create(:merge_request) }
 
-      it { service.close_mr(merge_request, merge_request.author).should be_true }
+      it { expect(service.close_mr(merge_request, merge_request.author)).to be_truthy }
 
       it "should create new event" do
         expect { service.close_mr(merge_request, merge_request.author) }.to change { Event.count }
@@ -59,7 +59,7 @@ describe EventCreateService do
     describe :merge_mr do
       let(:merge_request) { create(:merge_request) }
 
-      it { service.merge_mr(merge_request, merge_request.author).should be_true }
+      it { expect(service.merge_mr(merge_request, merge_request.author)).to be_truthy }
 
       it "should create new event" do
         expect { service.merge_mr(merge_request, merge_request.author) }.to change { Event.count }
@@ -69,7 +69,7 @@ describe EventCreateService do
     describe :reopen_mr do
       let(:merge_request) { create(:merge_request) }
 
-      it { service.reopen_mr(merge_request, merge_request.author).should be_true }
+      it { expect(service.reopen_mr(merge_request, merge_request.author)).to be_truthy }
 
       it "should create new event" do
         expect { service.reopen_mr(merge_request, merge_request.author) }.to change { Event.count }
@@ -83,7 +83,7 @@ describe EventCreateService do
     describe :open_milestone do
       let(:milestone) { create(:milestone) }
 
-      it { service.open_milestone(milestone, user).should be_true }
+      it { expect(service.open_milestone(milestone, user)).to be_truthy }
 
       it "should create new event" do
         expect { service.open_milestone(milestone, user) }.to change { Event.count }
@@ -93,7 +93,7 @@ describe EventCreateService do
     describe :close_mr do
       let(:milestone) { create(:milestone) }
 
-      it { service.close_milestone(milestone, user).should be_true }
+      it { expect(service.close_milestone(milestone, user)).to be_truthy }
 
       it "should create new event" do
         expect { service.close_milestone(milestone, user) }.to change { Event.count }
diff --git a/spec/services/git_push_service_spec.rb b/spec/services/git_push_service_spec.rb
index 3a75d65b5bc..9d0e41e4e8a 100644
--- a/spec/services/git_push_service_spec.rb
+++ b/spec/services/git_push_service_spec.rb
@@ -20,7 +20,7 @@ describe GitPushService do
         service.execute(project, user, @blankrev, @newrev, @ref)
       end
 
-      it { should be_true }
+      it { is_expected.to be_truthy }
     end
 
     context 'existing branch' do
@@ -28,7 +28,7 @@ describe GitPushService do
         service.execute(project, user, @oldrev, @newrev, @ref)
       end
 
-      it { should be_true }
+      it { is_expected.to be_truthy }
     end
 
     context 'rm branch' do
@@ -36,7 +36,7 @@ describe GitPushService do
         service.execute(project, user, @oldrev, @blankrev, @ref)
       end
 
-      it { should be_true }
+      it { is_expected.to be_truthy }
     end
   end
 
@@ -49,41 +49,43 @@ describe GitPushService do
 
     subject { @push_data }
 
-    it { should include(before: @oldrev) }
-    it { should include(after: @newrev) }
-    it { should include(ref: @ref) }
-    it { should include(user_id: user.id) }
-    it { should include(user_name: user.name) }
-    it { should include(project_id: project.id) }
+    it { is_expected.to include(before: @oldrev) }
+    it { is_expected.to include(after: @newrev) }
+    it { is_expected.to include(ref: @ref) }
+    it { is_expected.to include(user_id: user.id) }
+    it { is_expected.to include(user_name: user.name) }
+    it { is_expected.to include(project_id: project.id) }
 
     context "with repository data" do
       subject { @push_data[:repository] }
 
-      it { should include(name: project.name) }
-      it { should include(url: project.url_to_repo) }
-      it { should include(description: project.description) }
-      it { should include(homepage: project.web_url) }
+      it { is_expected.to include(name: project.name) }
+      it { is_expected.to include(url: project.url_to_repo) }
+      it { is_expected.to include(description: project.description) }
+      it { is_expected.to include(homepage: project.web_url) }
     end
 
     context "with commits" do
       subject { @push_data[:commits] }
 
-      it { should be_an(Array) }
-      it { should have(1).element }
+      it { is_expected.to be_an(Array) }
+      it 'has 1 element' do
+        expect(subject.size).to eq(1)
+      end
 
       context "the commit" do
         subject { @push_data[:commits].first }
 
-        it { should include(id: @commit.id) }
-        it { should include(message: @commit.safe_message) }
-        it { should include(timestamp: @commit.date.xmlschema) }
-        it { should include(url: "#{Gitlab.config.gitlab.url}/#{project.to_param}/commit/#{@commit.id}") }
+        it { is_expected.to include(id: @commit.id) }
+        it { is_expected.to include(message: @commit.safe_message) }
+        it { is_expected.to include(timestamp: @commit.date.xmlschema) }
+        it { is_expected.to include(url: "#{Gitlab.config.gitlab.url}/#{project.to_param}/commit/#{@commit.id}") }
 
         context "with a author" do
           subject { @push_data[:commits].first[:author] }
 
-          it { should include(name: @commit.author_name) }
-          it { should include(email: @commit.author_email) }
+          it { is_expected.to include(name: @commit.author_name) }
+          it { is_expected.to include(email: @commit.author_email) }
         end
       end
     end
@@ -95,46 +97,46 @@ describe GitPushService do
       @event = Event.last
     end
 
-    it { @event.should_not be_nil }
-    it { @event.project.should == project }
-    it { @event.action.should == Event::PUSHED }
-    it { @event.data.should == service.push_data }
+    it { expect(@event).not_to be_nil }
+    it { expect(@event.project).to eq(project) }
+    it { expect(@event.action).to eq(Event::PUSHED) }
+    it { expect(@event.data).to eq(service.push_data) }
   end
 
   describe "Web Hooks" do
     context "execute web hooks" do
       it "when pushing a branch for the first time" do
-        project.should_receive(:execute_hooks)
-        project.default_branch.should == "master"
-        project.protected_branches.should_receive(:create).with({ name: "master", developers_can_push: false })
+        expect(project).to receive(:execute_hooks)
+        expect(project.default_branch).to eq("master")
+        expect(project.protected_branches).to receive(:create).with({ name: "master", developers_can_push: false })
         service.execute(project, user, @blankrev, 'newrev', 'refs/heads/master')
       end
 
       it "when pushing a branch for the first time with default branch protection disabled" do
         ApplicationSetting.any_instance.stub(default_branch_protection: 0)
 
-        project.should_receive(:execute_hooks)
-        project.default_branch.should == "master"
-        project.protected_branches.should_not_receive(:create)
+        expect(project).to receive(:execute_hooks)
+        expect(project.default_branch).to eq("master")
+        expect(project.protected_branches).not_to receive(:create)
         service.execute(project, user, @blankrev, 'newrev', 'refs/heads/master')
       end
 
       it "when pushing a branch for the first time with default branch protection set to 'developers can push'" do
         ApplicationSetting.any_instance.stub(default_branch_protection: 1)
 
-        project.should_receive(:execute_hooks)
-        project.default_branch.should == "master"
-        project.protected_branches.should_receive(:create).with({ name: "master", developers_can_push: true })
+        expect(project).to receive(:execute_hooks)
+        expect(project.default_branch).to eq("master")
+        expect(project.protected_branches).to receive(:create).with({ name: "master", developers_can_push: true })
         service.execute(project, user, @blankrev, 'newrev', 'refs/heads/master')
       end
 
       it "when pushing new commits to existing branch" do
-        project.should_receive(:execute_hooks)
+        expect(project).to receive(:execute_hooks)
         service.execute(project, user, 'oldrev', 'newrev', 'refs/heads/master')
       end
 
       it "when pushing tags" do
-        project.should_not_receive(:execute_hooks)
+        expect(project).not_to receive(:execute_hooks)
         service.execute(project, user, 'newrev', 'newrev', 'refs/tags/v1.0.0')
       end
     end
@@ -156,7 +158,7 @@ describe GitPushService do
     end
 
     it "creates a note if a pushed commit mentions an issue" do
-      Note.should_receive(:create_cross_reference_note).with(issue, commit, commit_author, project)
+      expect(Note).to receive(:create_cross_reference_note).with(issue, commit, commit_author, project)
 
       service.execute(project, user, @oldrev, @newrev, @ref)
     end
@@ -164,32 +166,32 @@ describe GitPushService do
     it "only creates a cross-reference note if one doesn't already exist" do
       Note.create_cross_reference_note(issue, commit, user, project)
 
-      Note.should_not_receive(:create_cross_reference_note).with(issue, commit, commit_author, project)
+      expect(Note).not_to receive(:create_cross_reference_note).with(issue, commit, commit_author, project)
 
       service.execute(project, user, @oldrev, @newrev, @ref)
     end
 
     it "defaults to the pushing user if the commit's author is not known" do
       commit.stub(author_name: 'unknown name', author_email: 'unknown@email.com')
-      Note.should_receive(:create_cross_reference_note).with(issue, commit, user, project)
+      expect(Note).to receive(:create_cross_reference_note).with(issue, commit, user, project)
 
       service.execute(project, user, @oldrev, @newrev, @ref)
     end
 
     it "finds references in the first push to a non-default branch" do
-      project.repository.stub(:commits_between).with(@blankrev, @newrev).and_return([])
-      project.repository.stub(:commits_between).with("master", @newrev).and_return([commit])
+      allow(project.repository).to receive(:commits_between).with(@blankrev, @newrev).and_return([])
+      allow(project.repository).to receive(:commits_between).with("master", @newrev).and_return([commit])
 
-      Note.should_receive(:create_cross_reference_note).with(issue, commit, commit_author, project)
+      expect(Note).to receive(:create_cross_reference_note).with(issue, commit, commit_author, project)
 
       service.execute(project, user, @blankrev, @newrev, 'refs/heads/other')
     end
 
     it "finds references in the first push to a default branch" do
-      project.repository.stub(:commits_between).with(@blankrev, @newrev).and_return([])
-      project.repository.stub(:commits).with(@newrev).and_return([commit])
+      allow(project.repository).to receive(:commits_between).with(@blankrev, @newrev).and_return([])
+      allow(project.repository).to receive(:commits).with(@newrev).and_return([commit])
 
-      Note.should_receive(:create_cross_reference_note).with(issue, commit, commit_author, project)
+      expect(Note).to receive(:create_cross_reference_note).with(issue, commit, commit_author, project)
 
       service.execute(project, user, @blankrev, @newrev, 'refs/heads/master')
     end
@@ -215,7 +217,7 @@ describe GitPushService do
     it "closes issues with commit messages" do
       service.execute(project, user, @oldrev, @newrev, @ref)
 
-      Issue.find(issue.id).should be_closed
+      expect(Issue.find(issue.id)).to be_closed
     end
 
     it "doesn't create cross-reference notes for a closing reference" do
@@ -232,7 +234,7 @@ describe GitPushService do
         service.execute(project, user, @oldrev, @newrev, 'refs/heads/hurf')
       }.not_to change { Note.where(project_id: project.id, system: true).count }
 
-      Issue.find(issue.id).should be_opened
+      expect(Issue.find(issue.id)).to be_opened
     end
   end
 end
diff --git a/spec/services/git_tag_push_service_spec.rb b/spec/services/git_tag_push_service_spec.rb
index e65a8204c54..fcf462edbfc 100644
--- a/spec/services/git_tag_push_service_spec.rb
+++ b/spec/services/git_tag_push_service_spec.rb
@@ -19,27 +19,27 @@ describe GitTagPushService do
 
     subject { @push_data }
 
-    it { should include(ref: @ref) }
-    it { should include(before: @oldrev) }
-    it { should include(after: @newrev) }
-    it { should include(user_id: user.id) }
-    it { should include(user_name: user.name) }
-    it { should include(project_id: project.id) }
+    it { is_expected.to include(ref: @ref) }
+    it { is_expected.to include(before: @oldrev) }
+    it { is_expected.to include(after: @newrev) }
+    it { is_expected.to include(user_id: user.id) }
+    it { is_expected.to include(user_name: user.name) }
+    it { is_expected.to include(project_id: project.id) }
 
     context 'With repository data' do
       subject { @push_data[:repository] }
 
-      it { should include(name: project.name) }
-      it { should include(url: project.url_to_repo) }
-      it { should include(description: project.description) }
-      it { should include(homepage: project.web_url) }
+      it { is_expected.to include(name: project.name) }
+      it { is_expected.to include(url: project.url_to_repo) }
+      it { is_expected.to include(description: project.description) }
+      it { is_expected.to include(homepage: project.web_url) }
     end
   end
 
   describe "Web Hooks" do
     context "execute web hooks" do
       it "when pushing tags" do
-        project.should_receive(:execute_hooks)
+        expect(project).to receive(:execute_hooks)
         service.execute(project, user, 'oldrev', 'newrev', 'refs/tags/v1.0.0')
       end
     end
diff --git a/spec/services/issues/bulk_update_context_spec.rb b/spec/services/issues/bulk_update_context_spec.rb
index f4c9148f1a3..eb867f78c5c 100644
--- a/spec/services/issues/bulk_update_context_spec.rb
+++ b/spec/services/issues/bulk_update_context_spec.rb
@@ -30,11 +30,11 @@ describe Issues::BulkUpdateService do
 
     it {
       result = Issues::BulkUpdateService.new(@project, @user, @params).execute
-      result[:success].should be_true
-      result[:count].should == @issues.count
+      expect(result[:success]).to be_truthy
+      expect(result[:count]).to eq(@issues.count)
 
-      @project.issues.opened.should be_empty
-      @project.issues.closed.should_not be_empty
+      expect(@project.issues.opened).to be_empty
+      expect(@project.issues.closed).not_to be_empty
     }
 
   end
@@ -55,11 +55,11 @@ describe Issues::BulkUpdateService do
 
     it {
       result = Issues::BulkUpdateService.new(@project, @user, @params).execute
-      result[:success].should be_true
-      result[:count].should == @issues.count
+      expect(result[:success]).to be_truthy
+      expect(result[:count]).to eq(@issues.count)
 
-      @project.issues.closed.should be_empty
-      @project.issues.opened.should_not be_empty
+      expect(@project.issues.closed).to be_empty
+      expect(@project.issues.opened).not_to be_empty
     }
 
   end
@@ -78,10 +78,10 @@ describe Issues::BulkUpdateService do
 
     it {
       result = Issues::BulkUpdateService.new(@project, @user, @params).execute
-      result[:success].should be_true
-      result[:count].should == 1
+      expect(result[:success]).to be_truthy
+      expect(result[:count]).to eq(1)
 
-      @project.issues.first.assignee.should == @new_assignee
+      expect(@project.issues.first.assignee).to eq(@new_assignee)
     }
 
   end
@@ -100,10 +100,10 @@ describe Issues::BulkUpdateService do
 
     it {
       result = Issues::BulkUpdateService.new(@project, @user, @params).execute
-      result[:success].should be_true
-      result[:count].should == 1
+      expect(result[:success]).to be_truthy
+      expect(result[:count]).to eq(1)
 
-      @project.issues.first.milestone.should == @milestone
+      expect(@project.issues.first.milestone).to eq(@milestone)
     }
   end
 
diff --git a/spec/services/issues/close_service_spec.rb b/spec/services/issues/close_service_spec.rb
index d4f2cc1339b..d15dff1b52b 100644
--- a/spec/services/issues/close_service_spec.rb
+++ b/spec/services/issues/close_service_spec.rb
@@ -17,18 +17,18 @@ describe Issues::CloseService do
         @issue = Issues::CloseService.new(project, user, {}).execute(issue)
       end
 
-      it { @issue.should be_valid }
-      it { @issue.should be_closed }
+      it { expect(@issue).to be_valid }
+      it { expect(@issue).to be_closed }
 
       it 'should send email to user2 about assign of new issue' do
         email = ActionMailer::Base.deliveries.last
-        email.to.first.should == user2.email
-        email.subject.should include(issue.title)
+        expect(email.to.first).to eq(user2.email)
+        expect(email.subject).to include(issue.title)
       end
 
       it 'should create system note about issue reassign' do
         note = @issue.notes.last
-        note.note.should include "Status changed to closed"
+        expect(note.note).to include "Status changed to closed"
       end
     end
   end
diff --git a/spec/services/issues/create_service_spec.rb b/spec/services/issues/create_service_spec.rb
index 90720be5ded..7f1ebcb3198 100644
--- a/spec/services/issues/create_service_spec.rb
+++ b/spec/services/issues/create_service_spec.rb
@@ -16,8 +16,8 @@ describe Issues::CreateService do
         @issue = Issues::CreateService.new(project, user, opts).execute
       end
 
-      it { @issue.should be_valid }
-      it { @issue.title.should == 'Awesome issue' }
+      it { expect(@issue).to be_valid }
+      it { expect(@issue.title).to eq('Awesome issue') }
     end
   end
 end
diff --git a/spec/services/issues/update_service_spec.rb b/spec/services/issues/update_service_spec.rb
index 964b3a707e4..22b89bec96d 100644
--- a/spec/services/issues/update_service_spec.rb
+++ b/spec/services/issues/update_service_spec.rb
@@ -27,27 +27,27 @@ describe Issues::UpdateService do
         @issue.reload
       end
 
-      it { @issue.should be_valid }
-      it { @issue.title.should == 'New title' }
-      it { @issue.assignee.should == user2 }
-      it { @issue.should be_closed }
-      it { @issue.labels.count.should == 1 }
-      it { @issue.labels.first.title.should == 'Bug' }
+      it { expect(@issue).to be_valid }
+      it { expect(@issue.title).to eq('New title') }
+      it { expect(@issue.assignee).to eq(user2) }
+      it { expect(@issue).to be_closed }
+      it { expect(@issue.labels.count).to eq(1) }
+      it { expect(@issue.labels.first.title).to eq('Bug') }
 
       it 'should send email to user2 about assign of new issue' do
         email = ActionMailer::Base.deliveries.last
-        email.to.first.should == user2.email
-        email.subject.should include(issue.title)
+        expect(email.to.first).to eq(user2.email)
+        expect(email.subject).to include(issue.title)
       end
 
       it 'should create system note about issue reassign' do
         note = @issue.notes.last
-        note.note.should include "Reassigned to \@#{user2.username}"
+        expect(note.note).to include "Reassigned to \@#{user2.username}"
       end
 
       it 'should create system note about issue label edit' do
         note = @issue.notes[1]
-        note.note.should include "Added ~#{label.id} label"
+        expect(note.note).to include "Added ~#{label.id} label"
       end
     end
   end
diff --git a/spec/services/merge_requests/close_service_spec.rb b/spec/services/merge_requests/close_service_spec.rb
index 5060a67bebf..b3cbfd4b5b8 100644
--- a/spec/services/merge_requests/close_service_spec.rb
+++ b/spec/services/merge_requests/close_service_spec.rb
@@ -16,13 +16,13 @@ describe MergeRequests::CloseService do
       let(:service) { MergeRequests::CloseService.new(project, user, {}) }
 
       before do
-        service.stub(:execute_hooks)
+        allow(service).to receive(:execute_hooks)
 
         @merge_request = service.execute(merge_request)
       end
 
-      it { @merge_request.should be_valid }
-      it { @merge_request.should be_closed }
+      it { expect(@merge_request).to be_valid }
+      it { expect(@merge_request).to be_closed }
 
       it 'should execute hooks with close action' do
         expect(service).to have_received(:execute_hooks).
@@ -31,13 +31,13 @@ describe MergeRequests::CloseService do
 
       it 'should send email to user2 about assign of new merge_request' do
         email = ActionMailer::Base.deliveries.last
-        email.to.first.should == user2.email
-        email.subject.should include(merge_request.title)
+        expect(email.to.first).to eq(user2.email)
+        expect(email.subject).to include(merge_request.title)
       end
 
       it 'should create system note about merge_request reassign' do
         note = @merge_request.notes.last
-        note.note.should include 'Status changed to closed'
+        expect(note.note).to include 'Status changed to closed'
       end
     end
   end
diff --git a/spec/services/merge_requests/create_service_spec.rb b/spec/services/merge_requests/create_service_spec.rb
index dbd21143690..d9bfdf64308 100644
--- a/spec/services/merge_requests/create_service_spec.rb
+++ b/spec/services/merge_requests/create_service_spec.rb
@@ -18,13 +18,13 @@ describe MergeRequests::CreateService do
 
       before do
         project.team << [user, :master]
-        service.stub(:execute_hooks)
+        allow(service).to receive(:execute_hooks)
 
         @merge_request = service.execute
       end
 
-      it { @merge_request.should be_valid }
-      it { @merge_request.title.should == 'Awesome merge_request' }
+      it { expect(@merge_request).to be_valid }
+      it { expect(@merge_request.title).to eq('Awesome merge_request') }
 
       it 'should execute hooks with default action' do
         expect(service).to have_received(:execute_hooks).with(@merge_request)
diff --git a/spec/services/merge_requests/merge_service_spec.rb b/spec/services/merge_requests/merge_service_spec.rb
index 5f61fd3187b..0a25fb12f4e 100644
--- a/spec/services/merge_requests/merge_service_spec.rb
+++ b/spec/services/merge_requests/merge_service_spec.rb
@@ -16,13 +16,13 @@ describe MergeRequests::MergeService do
       let(:service) { MergeRequests::MergeService.new(project, user, {}) }
 
       before do
-        service.stub(:execute_hooks)
+        allow(service).to receive(:execute_hooks)
 
         service.execute(merge_request, 'Awesome message')
       end
 
-      it { merge_request.should be_valid }
-      it { merge_request.should be_merged }
+      it { expect(merge_request).to be_valid }
+      it { expect(merge_request).to be_merged }
 
       it 'should execute hooks with merge action' do
         expect(service).to have_received(:execute_hooks).
@@ -31,13 +31,13 @@ describe MergeRequests::MergeService do
 
       it 'should send email to user2 about merge of new merge_request' do
         email = ActionMailer::Base.deliveries.last
-        email.to.first.should == user2.email
-        email.subject.should include(merge_request.title)
+        expect(email.to.first).to eq(user2.email)
+        expect(email.subject).to include(merge_request.title)
       end
 
       it 'should create system note about merge_request merge' do
         note = merge_request.notes.last
-        note.note.should include 'Status changed to merged'
+        expect(note.note).to include 'Status changed to merged'
       end
     end
   end
diff --git a/spec/services/merge_requests/refresh_service_spec.rb b/spec/services/merge_requests/refresh_service_spec.rb
index 35c7aac94df..2830da87814 100644
--- a/spec/services/merge_requests/refresh_service_spec.rb
+++ b/spec/services/merge_requests/refresh_service_spec.rb
@@ -35,10 +35,10 @@ describe MergeRequests::RefreshService do
         reload_mrs
       end
 
-      it { @merge_request.notes.should_not be_empty }
-      it { @merge_request.should be_open }
-      it { @fork_merge_request.should be_open }
-      it { @fork_merge_request.notes.should be_empty }
+      it { expect(@merge_request.notes).not_to be_empty }
+      it { expect(@merge_request).to be_open }
+      it { expect(@fork_merge_request).to be_open }
+      it { expect(@fork_merge_request.notes).to be_empty }
     end
 
     context 'push to origin repo target branch' do
@@ -47,10 +47,10 @@ describe MergeRequests::RefreshService do
         reload_mrs
       end
 
-      it { @merge_request.notes.last.note.should include('changed to merged') }
-      it { @merge_request.should be_merged }
-      it { @fork_merge_request.should be_merged }
-      it { @fork_merge_request.notes.last.note.should include('changed to merged') }
+      it { expect(@merge_request.notes.last.note).to include('changed to merged') }
+      it { expect(@merge_request).to be_merged }
+      it { expect(@fork_merge_request).to be_merged }
+      it { expect(@fork_merge_request.notes.last.note).to include('changed to merged') }
     end
 
     context 'push to fork repo source branch' do
@@ -59,10 +59,10 @@ describe MergeRequests::RefreshService do
         reload_mrs
       end
 
-      it { @merge_request.notes.should be_empty }
-      it { @merge_request.should be_open }
-      it { @fork_merge_request.notes.last.note.should include('new commit') }
-      it { @fork_merge_request.should be_open }
+      it { expect(@merge_request.notes).to be_empty }
+      it { expect(@merge_request).to be_open }
+      it { expect(@fork_merge_request.notes.last.note).to include('new commit') }
+      it { expect(@fork_merge_request).to be_open }
     end
 
     context 'push to fork repo target branch' do
@@ -71,10 +71,10 @@ describe MergeRequests::RefreshService do
         reload_mrs
       end
 
-      it { @merge_request.notes.should be_empty }
-      it { @merge_request.should be_open }
-      it { @fork_merge_request.notes.should be_empty }
-      it { @fork_merge_request.should be_open }
+      it { expect(@merge_request.notes).to be_empty }
+      it { expect(@merge_request).to be_open }
+      it { expect(@fork_merge_request.notes).to be_empty }
+      it { expect(@fork_merge_request).to be_open }
     end
 
     context 'push to origin repo target branch after fork project was removed' do
@@ -84,10 +84,10 @@ describe MergeRequests::RefreshService do
         reload_mrs
       end
 
-      it { @merge_request.notes.last.note.should include('changed to merged') }
-      it { @merge_request.should be_merged }
-      it { @fork_merge_request.should be_open }
-      it { @fork_merge_request.notes.should be_empty }
+      it { expect(@merge_request.notes.last.note).to include('changed to merged') }
+      it { expect(@merge_request).to be_merged }
+      it { expect(@fork_merge_request).to be_open }
+      it { expect(@fork_merge_request.notes).to be_empty }
     end
 
     def reload_mrs
diff --git a/spec/services/merge_requests/reopen_service_spec.rb b/spec/services/merge_requests/reopen_service_spec.rb
index 2a7066124dc..9401bc3b558 100644
--- a/spec/services/merge_requests/reopen_service_spec.rb
+++ b/spec/services/merge_requests/reopen_service_spec.rb
@@ -16,14 +16,14 @@ describe MergeRequests::ReopenService do
       let(:service) { MergeRequests::ReopenService.new(project, user, {}) }
 
       before do
-        service.stub(:execute_hooks)
+        allow(service).to receive(:execute_hooks)
 
         merge_request.state = :closed
         service.execute(merge_request)
       end
 
-      it { merge_request.should be_valid }
-      it { merge_request.should be_reopened }
+      it { expect(merge_request).to be_valid }
+      it { expect(merge_request).to be_reopened }
 
       it 'should execute hooks with reopen action' do
         expect(service).to have_received(:execute_hooks).
@@ -32,13 +32,13 @@ describe MergeRequests::ReopenService do
 
       it 'should send email to user2 about reopen of merge_request' do
         email = ActionMailer::Base.deliveries.last
-        email.to.first.should == user2.email
-        email.subject.should include(merge_request.title)
+        expect(email.to.first).to eq(user2.email)
+        expect(email.subject).to include(merge_request.title)
       end
 
       it 'should create system note about merge_request reopen' do
         note = merge_request.notes.last
-        note.note.should include 'Status changed to reopened'
+        expect(note.note).to include 'Status changed to reopened'
       end
     end
   end
diff --git a/spec/services/merge_requests/update_service_spec.rb b/spec/services/merge_requests/update_service_spec.rb
index b27acb47711..916b01e1c45 100644
--- a/spec/services/merge_requests/update_service_spec.rb
+++ b/spec/services/merge_requests/update_service_spec.rb
@@ -27,18 +27,18 @@ describe MergeRequests::UpdateService do
       let(:service) { MergeRequests::UpdateService.new(project, user, opts) }
 
       before do
-        service.stub(:execute_hooks)
+        allow(service).to receive(:execute_hooks)
 
         @merge_request = service.execute(merge_request)
         @merge_request.reload
       end
 
-      it { @merge_request.should be_valid }
-      it { @merge_request.title.should == 'New title' }
-      it { @merge_request.assignee.should == user2 }
-      it { @merge_request.should be_closed }
-      it { @merge_request.labels.count.should == 1 }
-      it { @merge_request.labels.first.title.should == 'Bug' }
+      it { expect(@merge_request).to be_valid }
+      it { expect(@merge_request.title).to eq('New title') }
+      it { expect(@merge_request.assignee).to eq(user2) }
+      it { expect(@merge_request).to be_closed }
+      it { expect(@merge_request.labels.count).to eq(1) }
+      it { expect(@merge_request.labels.first.title).to eq('Bug') }
 
       it 'should execute hooks with update action' do
         expect(service).to have_received(:execute_hooks).
@@ -47,18 +47,18 @@ describe MergeRequests::UpdateService do
 
       it 'should send email to user2 about assign of new merge_request' do
         email = ActionMailer::Base.deliveries.last
-        email.to.first.should == user2.email
-        email.subject.should include(merge_request.title)
+        expect(email.to.first).to eq(user2.email)
+        expect(email.subject).to include(merge_request.title)
       end
 
       it 'should create system note about merge_request reassign' do
         note = @merge_request.notes.last
-        note.note.should include "Reassigned to \@#{user2.username}"
+        expect(note.note).to include "Reassigned to \@#{user2.username}"
       end
 
       it 'should create system note about merge_request label edit' do
         note = @merge_request.notes[1]
-        note.note.should include "Added ~#{label.id} label"
+        expect(note.note).to include "Added ~#{label.id} label"
       end
     end
   end
diff --git a/spec/services/notes/create_service_spec.rb b/spec/services/notes/create_service_spec.rb
index f59786efcf9..1a02299bf19 100644
--- a/spec/services/notes/create_service_spec.rb
+++ b/spec/services/notes/create_service_spec.rb
@@ -18,8 +18,8 @@ describe Notes::CreateService do
         @note = Notes::CreateService.new(project, user, opts).execute
       end
 
-      it { @note.should be_valid }
-      it { @note.note.should == 'Awesome comment' }
+      it { expect(@note).to be_valid }
+      it { expect(@note.note).to eq('Awesome comment') }
     end
   end
 end
diff --git a/spec/services/notification_service_spec.rb b/spec/services/notification_service_spec.rb
index 2ba1e3372b9..2074f8e7f78 100644
--- a/spec/services/notification_service_spec.rb
+++ b/spec/services/notification_service_spec.rb
@@ -7,10 +7,10 @@ describe NotificationService do
     describe :new_key do
       let!(:key) { create(:personal_key) }
 
-      it { notification.new_key(key).should be_true }
+      it { expect(notification.new_key(key)).to be_truthy }
 
       it 'should sent email to key owner' do
-        Notify.should_receive(:new_ssh_key_email).with(key.id)
+        expect(Notify).to receive(:new_ssh_key_email).with(key.id)
         notification.new_key(key)
       end
     end
@@ -20,10 +20,10 @@ describe NotificationService do
     describe :new_email do
       let!(:email) { create(:email) }
 
-      it { notification.new_email(email).should be_true }
+      it { expect(notification.new_email(email)).to be_truthy }
 
       it 'should send email to email owner' do
-        Notify.should_receive(:new_email_email).with(email.id)
+        expect(Notify).to receive(:new_email_email).with(email.id)
         notification.new_email(email)
       end
     end
@@ -54,7 +54,7 @@ describe NotificationService do
         it 'filters out "mentioned in" notes' do
           mentioned_note = Note.create_cross_reference_note(mentioned_issue, issue, issue.author, issue.project)
 
-          Notify.should_not_receive(:note_issue_email)
+          expect(Notify).not_to receive(:note_issue_email)
           notification.new_note(mentioned_note)
         end
       end
@@ -87,11 +87,11 @@ describe NotificationService do
       end
 
       def should_email(user_id)
-        Notify.should_receive(:note_issue_email).with(user_id, note.id)
+        expect(Notify).to receive(:note_issue_email).with(user_id, note.id)
       end
 
       def should_not_email(user_id)
-        Notify.should_not_receive(:note_issue_email).with(user_id, note.id)
+        expect(Notify).not_to receive(:note_issue_email).with(user_id, note.id)
       end
     end
 
@@ -125,17 +125,17 @@ describe NotificationService do
         it 'filters out "mentioned in" notes' do
           mentioned_note = Note.create_cross_reference_note(mentioned_issue, issue, issue.author, issue.project)
 
-          Notify.should_not_receive(:note_issue_email)
+          expect(Notify).not_to receive(:note_issue_email)
           notification.new_note(mentioned_note)
         end
       end
 
       def should_email(user_id)
-        Notify.should_receive(:note_issue_email).with(user_id, note.id)
+        expect(Notify).to receive(:note_issue_email).with(user_id, note.id)
       end
 
       def should_not_email(user_id)
-        Notify.should_not_receive(:note_issue_email).with(user_id, note.id)
+        expect(Notify).not_to receive(:note_issue_email).with(user_id, note.id)
       end
     end
 
@@ -176,11 +176,11 @@ describe NotificationService do
         end
 
         def should_email(user_id, n)
-          Notify.should_receive(:note_commit_email).with(user_id, n.id)
+          expect(Notify).to receive(:note_commit_email).with(user_id, n.id)
         end
 
         def should_not_email(user_id, n)
-          Notify.should_not_receive(:note_commit_email).with(user_id, n.id)
+          expect(Notify).not_to receive(:note_commit_email).with(user_id, n.id)
         end
       end
     end
@@ -211,11 +211,11 @@ describe NotificationService do
       end
 
       def should_email(user_id)
-        Notify.should_receive(:new_issue_email).with(user_id, issue.id)
+        expect(Notify).to receive(:new_issue_email).with(user_id, issue.id)
       end
 
       def should_not_email(user_id)
-        Notify.should_not_receive(:new_issue_email).with(user_id, issue.id)
+        expect(Notify).not_to receive(:new_issue_email).with(user_id, issue.id)
       end
     end
 
@@ -231,11 +231,11 @@ describe NotificationService do
       end
 
       def should_email(user_id)
-        Notify.should_receive(:reassigned_issue_email).with(user_id, issue.id, nil, @u_disabled.id)
+        expect(Notify).to receive(:reassigned_issue_email).with(user_id, issue.id, nil, @u_disabled.id)
       end
 
       def should_not_email(user_id)
-        Notify.should_not_receive(:reassigned_issue_email).with(user_id, issue.id, issue.assignee_id, @u_disabled.id)
+        expect(Notify).not_to receive(:reassigned_issue_email).with(user_id, issue.id, issue.assignee_id, @u_disabled.id)
       end
     end
 
@@ -252,11 +252,11 @@ describe NotificationService do
       end
 
       def should_email(user_id)
-        Notify.should_receive(:closed_issue_email).with(user_id, issue.id, @u_disabled.id)
+        expect(Notify).to receive(:closed_issue_email).with(user_id, issue.id, @u_disabled.id)
       end
 
       def should_not_email(user_id)
-        Notify.should_not_receive(:closed_issue_email).with(user_id, issue.id, @u_disabled.id)
+        expect(Notify).not_to receive(:closed_issue_email).with(user_id, issue.id, @u_disabled.id)
       end
     end
 
@@ -273,11 +273,11 @@ describe NotificationService do
       end
 
       def should_email(user_id)
-        Notify.should_receive(:issue_status_changed_email).with(user_id, issue.id, 'reopened', @u_disabled.id)
+        expect(Notify).to receive(:issue_status_changed_email).with(user_id, issue.id, 'reopened', @u_disabled.id)
       end
 
       def should_not_email(user_id)
-        Notify.should_not_receive(:issue_status_changed_email).with(user_id, issue.id, 'reopened', @u_disabled.id)
+        expect(Notify).not_to receive(:issue_status_changed_email).with(user_id, issue.id, 'reopened', @u_disabled.id)
       end
     end
   end
@@ -299,11 +299,11 @@ describe NotificationService do
       end
 
       def should_email(user_id)
-        Notify.should_receive(:new_merge_request_email).with(user_id, merge_request.id)
+        expect(Notify).to receive(:new_merge_request_email).with(user_id, merge_request.id)
       end
 
       def should_not_email(user_id)
-        Notify.should_not_receive(:new_merge_request_email).with(user_id, merge_request.id)
+        expect(Notify).not_to receive(:new_merge_request_email).with(user_id, merge_request.id)
       end
     end
 
@@ -317,11 +317,11 @@ describe NotificationService do
       end
 
       def should_email(user_id)
-        Notify.should_receive(:reassigned_merge_request_email).with(user_id, merge_request.id, nil, merge_request.author_id)
+        expect(Notify).to receive(:reassigned_merge_request_email).with(user_id, merge_request.id, nil, merge_request.author_id)
       end
 
       def should_not_email(user_id)
-        Notify.should_not_receive(:reassigned_merge_request_email).with(user_id, merge_request.id, merge_request.assignee_id, merge_request.author_id)
+        expect(Notify).not_to receive(:reassigned_merge_request_email).with(user_id, merge_request.id, merge_request.assignee_id, merge_request.author_id)
       end
     end
 
@@ -335,11 +335,11 @@ describe NotificationService do
       end
 
       def should_email(user_id)
-        Notify.should_receive(:closed_merge_request_email).with(user_id, merge_request.id, @u_disabled.id)
+        expect(Notify).to receive(:closed_merge_request_email).with(user_id, merge_request.id, @u_disabled.id)
       end
 
       def should_not_email(user_id)
-        Notify.should_not_receive(:closed_merge_request_email).with(user_id, merge_request.id, @u_disabled.id)
+        expect(Notify).not_to receive(:closed_merge_request_email).with(user_id, merge_request.id, @u_disabled.id)
       end
     end
 
@@ -353,11 +353,11 @@ describe NotificationService do
       end
 
       def should_email(user_id)
-        Notify.should_receive(:merged_merge_request_email).with(user_id, merge_request.id, @u_disabled.id)
+        expect(Notify).to receive(:merged_merge_request_email).with(user_id, merge_request.id, @u_disabled.id)
       end
 
       def should_not_email(user_id)
-        Notify.should_not_receive(:merged_merge_request_email).with(user_id, merge_request.id, @u_disabled.id)
+        expect(Notify).not_to receive(:merged_merge_request_email).with(user_id, merge_request.id, @u_disabled.id)
       end
     end
 
@@ -371,11 +371,11 @@ describe NotificationService do
       end
 
       def should_email(user_id)
-        Notify.should_receive(:merge_request_status_email).with(user_id, merge_request.id, 'reopened', @u_disabled.id)
+        expect(Notify).to receive(:merge_request_status_email).with(user_id, merge_request.id, 'reopened', @u_disabled.id)
       end
 
       def should_not_email(user_id)
-        Notify.should_not_receive(:merge_request_status_email).with(user_id, merge_request.id, 'reopened', @u_disabled.id)
+        expect(Notify).not_to receive(:merge_request_status_email).with(user_id, merge_request.id, 'reopened', @u_disabled.id)
       end
     end
   end
@@ -396,11 +396,11 @@ describe NotificationService do
       end
 
       def should_email(user_id)
-        Notify.should_receive(:project_was_moved_email).with(project.id, user_id)
+        expect(Notify).to receive(:project_was_moved_email).with(project.id, user_id)
       end
 
       def should_not_email(user_id)
-        Notify.should_not_receive(:project_was_moved_email).with(project.id, user_id)
+        expect(Notify).not_to receive(:project_was_moved_email).with(project.id, user_id)
       end
     end
   end
diff --git a/spec/services/projects/create_service_spec.rb b/spec/services/projects/create_service_spec.rb
index 9c97dad2ff0..8bb48346202 100644
--- a/spec/services/projects/create_service_spec.rb
+++ b/spec/services/projects/create_service_spec.rb
@@ -16,9 +16,9 @@ describe Projects::CreateService do
         @project = create_project(@user, @opts)
       end
 
-      it { @project.should be_valid }
-      it { @project.owner.should == @user }
-      it { @project.namespace.should == @user.namespace }
+      it { expect(@project).to be_valid }
+      it { expect(@project.owner).to eq(@user) }
+      it { expect(@project.namespace).to eq(@user.namespace) }
     end
 
     context 'group namespace' do
@@ -30,9 +30,9 @@ describe Projects::CreateService do
         @project = create_project(@user, @opts)
       end
 
-      it { @project.should be_valid }
-      it { @project.owner.should == @group }
-      it { @project.namespace.should == @group }
+      it { expect(@project).to be_valid }
+      it { expect(@project.owner).to eq(@group) }
+      it { expect(@project.namespace).to eq(@group) }
     end
 
     context 'wiki_enabled creates repository directory' do
@@ -42,7 +42,7 @@ describe Projects::CreateService do
           @path = ProjectWiki.new(@project, @user).send(:path_to_repo)
         end
 
-        it { File.exists?(@path).should be_true }
+        it { expect(File.exists?(@path)).to be_truthy }
       end
 
       context 'wiki_enabled false does not create wiki repository directory' do
@@ -52,7 +52,7 @@ describe Projects::CreateService do
           @path = ProjectWiki.new(@project, @user).send(:path_to_repo)
         end
 
-        it { File.exists?(@path).should be_false }
+        it { expect(File.exists?(@path)).to be_falsey }
       end
     end
   end
diff --git a/spec/services/projects/fork_service_spec.rb b/spec/services/projects/fork_service_spec.rb
index 5c80345c2b3..e55a2e3f8a0 100644
--- a/spec/services/projects/fork_service_spec.rb
+++ b/spec/services/projects/fork_service_spec.rb
@@ -16,18 +16,18 @@ describe Projects::ForkService do
       describe "successfully creates project in the user namespace" do
         let(:to_project) { fork_project(@from_project, @to_user) }
 
-        it { to_project.owner.should == @to_user }
-        it { to_project.namespace.should == @to_user.namespace }
-        it { to_project.star_count.should be_zero }
-        it { to_project.description.should == @from_project.description }
+        it { expect(to_project.owner).to eq(@to_user) }
+        it { expect(to_project.namespace).to eq(@to_user.namespace) }
+        it { expect(to_project.star_count).to be_zero }
+        it { expect(to_project.description).to eq(@from_project.description) }
       end
     end
 
     context 'fork project failure' do
       it "fails due to transaction failure" do
         @to_project = fork_project(@from_project, @to_user, false)
-        @to_project.errors.should_not be_empty
-        @to_project.errors[:base].should include("Fork transaction failed.")
+        expect(@to_project.errors).not_to be_empty
+        expect(@to_project.errors[:base]).to include("Fork transaction failed.")
       end
     end
 
@@ -35,9 +35,9 @@ describe Projects::ForkService do
       it "should fail due to validation, not transaction failure" do
         @existing_project = create(:project, creator_id: @to_user.id, name: @from_project.name, namespace: @to_namespace)
         @to_project = fork_project(@from_project, @to_user)
-        @existing_project.persisted?.should be_true
-        @to_project.errors[:base].should include("Invalid fork destination")
-        @to_project.errors[:base].should_not include("Fork transaction failed.")
+        expect(@existing_project.persisted?).to be_truthy
+        expect(@to_project.errors[:base]).to include("Invalid fork destination")
+        expect(@to_project.errors[:base]).not_to include("Fork transaction failed.")
       end
     end
   end
@@ -58,19 +58,19 @@ describe Projects::ForkService do
     context 'fork project for group' do
       it 'group owner successfully forks project into the group' do
         to_project = fork_project(@project, @group_owner, true, @opts)
-        to_project.owner.should       == @group
-        to_project.namespace.should   == @group
-        to_project.name.should        == @project.name
-        to_project.path.should        == @project.path
-        to_project.description.should == @project.description
-        to_project.star_count.should     be_zero
+        expect(to_project.owner).to       eq(@group)
+        expect(to_project.namespace).to   eq(@group)
+        expect(to_project.name).to        eq(@project.name)
+        expect(to_project.path).to        eq(@project.path)
+        expect(to_project.description).to eq(@project.description)
+        expect(to_project.star_count).to     be_zero
       end
     end
 
     context 'fork project for group when user not owner' do
       it 'group developer should fail to fork project into the group' do
         to_project = fork_project(@project, @developer, true, @opts)
-        to_project.errors[:namespace].should == ['insufficient access rights']
+        expect(to_project.errors[:namespace]).to eq(['insufficient access rights'])
       end
     end
 
@@ -79,10 +79,10 @@ describe Projects::ForkService do
         existing_project = create(:project, name: @project.name,
                                             namespace: @group)
         to_project = fork_project(@project, @group_owner, true, @opts)
-        existing_project.persisted?.should be_true
-        to_project.errors[:base].should == ['Invalid fork destination']
-        to_project.errors[:name].should == ['has already been taken']
-        to_project.errors[:path].should == ['has already been taken']
+        expect(existing_project.persisted?).to be_truthy
+        expect(to_project.errors[:base]).to eq(['Invalid fork destination'])
+        expect(to_project.errors[:name]).to eq(['has already been taken'])
+        expect(to_project.errors[:path]).to eq(['has already been taken'])
       end
     end
   end
diff --git a/spec/services/projects/transfer_service_spec.rb b/spec/services/projects/transfer_service_spec.rb
index 79d0526ff89..46fb5f5fae5 100644
--- a/spec/services/projects/transfer_service_spec.rb
+++ b/spec/services/projects/transfer_service_spec.rb
@@ -11,8 +11,8 @@ describe Projects::TransferService do
       @result = transfer_project(project, user, namespace_id: group.id)
     end
 
-    it { @result.should be_true }
-    it { project.namespace.should == group }
+    it { expect(@result).to be_truthy }
+    it { expect(project.namespace).to eq(group) }
   end
 
   context 'namespace -> no namespace' do
@@ -20,9 +20,9 @@ describe Projects::TransferService do
       @result = transfer_project(project, user, namespace_id: nil)
     end
 
-    it { @result.should_not be_nil } # { result.should be_false } passes on nil
-    it { @result.should be_false }
-    it { project.namespace.should == user.namespace }
+    it { expect(@result).not_to be_nil } # { result.should be_false } passes on nil
+    it { expect(@result).to be_falsey }
+    it { expect(project.namespace).to eq(user.namespace) }
   end
 
   context 'namespace -> not allowed namespace' do
@@ -30,9 +30,9 @@ describe Projects::TransferService do
       @result = transfer_project(project, user, namespace_id: group.id)
     end
 
-    it { @result.should_not be_nil } # { result.should be_false } passes on nil
-    it { @result.should be_false }
-    it { project.namespace.should == user.namespace }
+    it { expect(@result).not_to be_nil } # { result.should be_false } passes on nil
+    it { expect(@result).to be_falsey }
+    it { expect(project.namespace).to eq(user.namespace) }
   end
 
   def transfer_project(project, user, params)
diff --git a/spec/services/projects/update_service_spec.rb b/spec/services/projects/update_service_spec.rb
index 5a10174eb36..10dbc548e86 100644
--- a/spec/services/projects/update_service_spec.rb
+++ b/spec/services/projects/update_service_spec.rb
@@ -17,8 +17,8 @@ describe Projects::UpdateService do
         update_project(@project, @user, @opts)
       end
 
-      it { @created_private.should be_true }
-      it { @project.private?.should be_true }
+      it { expect(@created_private).to be_truthy }
+      it { expect(@project.private?).to be_truthy }
     end
 
     context 'should be internal when updated to internal' do
@@ -29,8 +29,8 @@ describe Projects::UpdateService do
         update_project(@project, @user, @opts)
       end
 
-      it { @created_private.should be_true }
-      it { @project.internal?.should be_true }
+      it { expect(@created_private).to be_truthy }
+      it { expect(@project.internal?).to be_truthy }
     end
 
     context 'should be public when updated to public' do
@@ -41,14 +41,14 @@ describe Projects::UpdateService do
         update_project(@project, @user, @opts)
       end
 
-      it { @created_private.should be_true }
-      it { @project.public?.should be_true }
+      it { expect(@created_private).to be_truthy }
+      it { expect(@project.public?).to be_truthy }
     end
 
     context 'respect configured visibility restrictions setting' do
       before(:each) do
         @restrictions = double("restrictions")
-        @restrictions.stub(:restricted_visibility_levels) { [ "public" ] }
+        allow(@restrictions).to receive(:restricted_visibility_levels) { [ "public" ] }
         Settings.stub_chain(:gitlab).and_return(@restrictions)
       end
 
@@ -60,8 +60,8 @@ describe Projects::UpdateService do
           update_project(@project, @user, @opts)
         end
 
-        it { @created_private.should be_true }
-        it { @project.private?.should be_true }
+        it { expect(@created_private).to be_truthy }
+        it { expect(@project.private?).to be_truthy }
       end
 
       context 'should be internal when updated to internal' do
@@ -72,8 +72,8 @@ describe Projects::UpdateService do
           update_project(@project, @user, @opts)
         end
 
-        it { @created_private.should be_true }
-        it { @project.internal?.should be_true }
+        it { expect(@created_private).to be_truthy }
+        it { expect(@project.internal?).to be_truthy }
       end
 
       context 'should be private when updated to public' do
@@ -84,8 +84,8 @@ describe Projects::UpdateService do
           update_project(@project, @user, @opts)
         end
 
-        it { @created_private.should be_true }
-        it { @project.private?.should be_true }
+        it { expect(@created_private).to be_truthy }
+        it { expect(@project.private?).to be_truthy }
       end
 
       context 'should be public when updated to public by admin' do
@@ -96,8 +96,8 @@ describe Projects::UpdateService do
           update_project(@project, @admin, @opts)
         end
 
-        it { @created_private.should be_true }
-        it { @project.public?.should be_true }
+        it { expect(@created_private).to be_truthy }
+        it { expect(@project.public?).to be_truthy }
       end
     end
   end
diff --git a/spec/services/search_service_spec.rb b/spec/services/search_service_spec.rb
index 3217c571e67..f57bfaea879 100644
--- a/spec/services/search_service_spec.rb
+++ b/spec/services/search_service_spec.rb
@@ -19,7 +19,7 @@ describe 'Search::GlobalService' do
       it 'should return public projects only' do
         context = Search::GlobalService.new(nil, search: "searchable")
         results = context.execute
-        results.objects('projects').should match_array [public_project]
+        expect(results.objects('projects')).to match_array [public_project]
       end
     end
 
@@ -27,19 +27,19 @@ describe 'Search::GlobalService' do
       it 'should return public, internal and private projects' do
         context = Search::GlobalService.new(user, search: "searchable")
         results = context.execute
-        results.objects('projects').should match_array [public_project, found_project, internal_project]
+        expect(results.objects('projects')).to match_array [public_project, found_project, internal_project]
       end
 
       it 'should return only public & internal projects' do
         context = Search::GlobalService.new(internal_user, search: "searchable")
         results = context.execute
-        results.objects('projects').should match_array [internal_project, public_project]
+        expect(results.objects('projects')).to match_array [internal_project, public_project]
       end
 
       it 'namespace name should be searchable' do
         context = Search::GlobalService.new(user, search: found_project.namespace.path)
         results = context.execute
-        results.objects('projects').should match_array [found_project]
+        expect(results.objects('projects')).to match_array [found_project]
       end
     end
   end
diff --git a/spec/services/system_hooks_service_spec.rb b/spec/services/system_hooks_service_spec.rb
index a45e9d0575c..199ac996608 100644
--- a/spec/services/system_hooks_service_spec.rb
+++ b/spec/services/system_hooks_service_spec.rb
@@ -9,35 +9,35 @@ describe SystemHooksService do
   let (:group_member)  { create(:group_member) }
 
   context 'event data' do
-    it { event_data(user, :create).should include(:event_name, :name, :created_at, :email, :user_id) }
-    it { event_data(user, :destroy).should include(:event_name, :name, :created_at, :email, :user_id) }
-    it { event_data(project, :create).should include(:event_name, :name, :created_at, :path, :project_id, :owner_name, :owner_email, :project_visibility) }
-    it { event_data(project, :destroy).should include(:event_name, :name, :created_at, :path, :project_id, :owner_name, :owner_email, :project_visibility) }
-    it { event_data(project_member, :create).should include(:event_name, :created_at, :project_name, :project_path, :project_id, :user_name, :user_email, :access_level, :project_visibility) }
-    it { event_data(project_member, :destroy).should include(:event_name, :created_at, :project_name, :project_path, :project_id, :user_name, :user_email, :access_level, :project_visibility) }
-    it { event_data(key, :create).should include(:username, :key, :id) }
-    it { event_data(key, :destroy).should include(:username, :key, :id) }
+    it { expect(event_data(user, :create)).to include(:event_name, :name, :created_at, :email, :user_id) }
+    it { expect(event_data(user, :destroy)).to include(:event_name, :name, :created_at, :email, :user_id) }
+    it { expect(event_data(project, :create)).to include(:event_name, :name, :created_at, :path, :project_id, :owner_name, :owner_email, :project_visibility) }
+    it { expect(event_data(project, :destroy)).to include(:event_name, :name, :created_at, :path, :project_id, :owner_name, :owner_email, :project_visibility) }
+    it { expect(event_data(project_member, :create)).to include(:event_name, :created_at, :project_name, :project_path, :project_id, :user_name, :user_email, :access_level, :project_visibility) }
+    it { expect(event_data(project_member, :destroy)).to include(:event_name, :created_at, :project_name, :project_path, :project_id, :user_name, :user_email, :access_level, :project_visibility) }
+    it { expect(event_data(key, :create)).to include(:username, :key, :id) }
+    it { expect(event_data(key, :destroy)).to include(:username, :key, :id) }
 
     it do
-      event_data(group, :create).should include(
+      expect(event_data(group, :create)).to include(
         :event_name, :name, :created_at, :path, :group_id, :owner_name,
         :owner_email
       )
     end
     it do
-      event_data(group, :destroy).should include(
+      expect(event_data(group, :destroy)).to include(
         :event_name, :name, :created_at, :path, :group_id, :owner_name,
         :owner_email
       )
     end
     it do
-      event_data(group_member, :create).should include(
+      expect(event_data(group_member, :create)).to include(
         :event_name, :created_at, :group_name, :group_path, :group_id, :user_id,
         :user_name, :user_email, :group_access
       )
     end
     it do
-      event_data(group_member, :destroy).should include(
+      expect(event_data(group_member, :destroy)).to include(
         :event_name, :created_at, :group_name, :group_path, :group_id, :user_id,
         :user_name, :user_email, :group_access
       )
@@ -45,18 +45,18 @@ describe SystemHooksService do
   end
 
   context 'event names' do
-    it { event_name(user, :create).should eq "user_create" }
-    it { event_name(user, :destroy).should eq "user_destroy" }
-    it { event_name(project, :create).should eq "project_create" }
-    it { event_name(project, :destroy).should eq "project_destroy" }
-    it { event_name(project_member, :create).should eq "user_add_to_team" }
-    it { event_name(project_member, :destroy).should eq "user_remove_from_team" }
-    it { event_name(key, :create).should eq 'key_create' }
-    it { event_name(key, :destroy).should eq 'key_destroy' }
-    it { event_name(group, :create).should eq 'group_create' }
-    it { event_name(group, :destroy).should eq 'group_destroy' }
-    it { event_name(group_member, :create).should eq 'user_add_to_group' }
-    it { event_name(group_member, :destroy).should eq 'user_remove_from_group' }
+    it { expect(event_name(user, :create)).to eq "user_create" }
+    it { expect(event_name(user, :destroy)).to eq "user_destroy" }
+    it { expect(event_name(project, :create)).to eq "project_create" }
+    it { expect(event_name(project, :destroy)).to eq "project_destroy" }
+    it { expect(event_name(project_member, :create)).to eq "user_add_to_team" }
+    it { expect(event_name(project_member, :destroy)).to eq "user_remove_from_team" }
+    it { expect(event_name(key, :create)).to eq 'key_create' }
+    it { expect(event_name(key, :destroy)).to eq 'key_destroy' }
+    it { expect(event_name(group, :create)).to eq 'group_create' }
+    it { expect(event_name(group, :destroy)).to eq 'group_destroy' }
+    it { expect(event_name(group_member, :create)).to eq 'user_add_to_group' }
+    it { expect(event_name(group_member, :destroy)).to eq 'user_remove_from_group' }
   end
 
   def event_data(*args)
diff --git a/spec/services/test_hook_service_spec.rb b/spec/services/test_hook_service_spec.rb
index 76af5bf7b88..d2b505f55a2 100644
--- a/spec/services/test_hook_service_spec.rb
+++ b/spec/services/test_hook_service_spec.rb
@@ -8,7 +8,7 @@ describe TestHookService do
   describe :execute do
     it "should execute successfully" do
       stub_request(:post, hook.url).to_return(status: 200)
-      TestHookService.new.execute(hook, user).should be_true
+      expect(TestHookService.new.execute(hook, user)).to be_truthy
     end
   end
 end