7 files changed, 63 insertions, 63 deletions
diff --git a/spec/services/create_commit_service_spec.rb b/spec/services/create_commit_service_spec.rb
index 05793eb..209e088 100644
--- a/spec/services/create_commit_service_spec.rb
+++ b/spec/services/create_commit_service_spec.rb
@@ -16,11 +16,11 @@ describe CreateCommitService do
         )
       end
 
-      it { commit.should be_kind_of(Commit) }
-      it { commit.should be_valid }
-      it { commit.should be_persisted }
-      it { commit.should eq project.commits.last }
-      it { commit.builds.first.should be_kind_of(Build) }
+      it { expect(commit).to be_kind_of(Commit) }
+      it { expect(commit).to be_valid }
+      it { expect(commit).to be_persisted }
+      it { expect(commit).to eq project.commits.last }
+      it { expect(commit.builds.first).to be_kind_of(Build) }
     end
 
     context "skip tag if there is no build for it" do
@@ -32,7 +32,7 @@ describe CreateCommitService do
           ci_yaml_file: gitlab_ci_yaml,
           commits: [ { message: "Message" } ]
         )
-        result.should be_persisted
+        expect(result).to be_persisted
       end
 
       it "creates commit if there is no appropriate job but deploy job has right ref setting" do
@@ -45,7 +45,7 @@ describe CreateCommitService do
           ci_yaml_file: config,
           commits: [ { message: "Message" } ]
         )
-        result.should be_persisted
+        expect(result).to be_persisted
       end
     end
 
@@ -59,8 +59,8 @@ describe CreateCommitService do
           commits: commits,
           ci_yaml_file: gitlab_ci_yaml
         )
-        commit.builds.any?.should be_falsey
-        commit.status.should eq "skipped"
+        expect(commit.builds.any?).to be_falsey
+        expect(commit.status).to eq "skipped"
       end
 
       it "does not skips builds creation if there is no [ci skip] tag in commit message" do
@@ -74,7 +74,7 @@ describe CreateCommitService do
           ci_yaml_file: gitlab_ci_yaml
         )
         
-        commit.builds.first.name.should eq "staging"
+        expect(commit.builds.first.name).to eq "staging"
       end
 
       it "skips builds creation if there is [ci skip] tag in commit message and yaml is invalid" do
@@ -86,8 +86,8 @@ describe CreateCommitService do
                                  commits: commits,
                                  ci_yaml_file: "invalid: file"
         )
-        commit.builds.any?.should be_falsey
-        commit.status.should eq "skipped"
+        expect(commit.builds.any?).to be_falsey
+        expect(commit.status).to eq "skipped"
       end
     end
 
@@ -100,7 +100,7 @@ describe CreateCommitService do
         commits: commits,
         ci_yaml_file: gitlab_ci_yaml
       )
-      commit.builds.count(:all).should eq 2
+      expect(commit.builds.count(:all)).to eq 2
 
       commit = service.execute(project,
         ref: 'refs/heads/master',
@@ -109,7 +109,7 @@ describe CreateCommitService do
         commits: commits,
         ci_yaml_file: gitlab_ci_yaml
       )
-      commit.builds.count(:all).should eq 2
+      expect(commit.builds.count(:all)).to eq 2
     end
 
     it "creates commit with failed status if yaml is invalid" do
@@ -123,8 +123,8 @@ describe CreateCommitService do
                                ci_yaml_file: "invalid: file"
       )
 
-      commit.status.should eq "failed"
-      commit.builds.any?.should be_falsey
+      expect(commit.status).to eq "failed"
+      expect(commit.builds.any?).to be_falsey
     end
   end
 end
diff --git a/spec/services/create_project_service_spec.rb b/spec/services/create_project_service_spec.rb
index 1a1a433..085d5e9 100644
--- a/spec/services/create_project_service_spec.rb
+++ b/spec/services/create_project_service_spec.rb
@@ -11,8 +11,8 @@ describe CreateProjectService do
     context 'valid params' do
       let(:project) { service.execute(current_user, project_dump, 'http://localhost/projects/:project_id') }
 
-      it { project.should be_kind_of(Project) }
-      it { project.should be_persisted }
+      it { expect(project).to be_kind_of(Project) }
+      it { expect(project).to be_persisted }
     end
 
     context 'without project dump' do
@@ -32,9 +32,9 @@ describe CreateProjectService do
 
         project = service.execute(current_user, project_dump, 'http://localhost/projects/:project_id', origin_project)
 
-        project.shared_runners_enabled.should be_truthy
-        project.public.should be_truthy
-        project.allow_git_fetch.should be_truthy
+        expect(project.shared_runners_enabled).to be_truthy
+        expect(project.public).to be_truthy
+        expect(project.allow_git_fetch).to be_truthy
       end
     end
   end
diff --git a/spec/services/create_trigger_request_service_spec.rb b/spec/services/create_trigger_request_service_spec.rb
index cb9a1e6..0634753 100644
--- a/spec/services/create_trigger_request_service_spec.rb
+++ b/spec/services/create_trigger_request_service_spec.rb
@@ -13,14 +13,14 @@ describe CreateTriggerRequestService do
         @commit = FactoryGirl.create :commit, project: project
       end
 
-      it { subject.should be_kind_of(TriggerRequest) }
-      it { subject.commit.should eq @commit }
+      it { expect(subject).to be_kind_of(TriggerRequest) }
+      it { expect(subject.commit).to eq @commit }
     end
 
     context 'no commit for ref' do
       subject { service.execute(project, trigger, 'other-branch') }
 
-      it { subject.should be_nil }
+      it { expect(subject).to be_nil }
     end
 
     context 'no builds created' do
@@ -30,7 +30,7 @@ describe CreateTriggerRequestService do
         FactoryGirl.create :commit_without_jobs, project: project
       end
 
-      it { subject.should be_nil }
+      it { expect(subject).to be_nil }
     end
 
     context 'for multiple commits' do
@@ -43,9 +43,9 @@ describe CreateTriggerRequestService do
       end
 
       context 'retries latest one' do
-        it { subject.should be_kind_of(TriggerRequest) }
-        it { subject.should be_persisted }
-        it { subject.commit.should eq @commit2 }
+        it { expect(subject).to be_kind_of(TriggerRequest) }
+        it { expect(subject).to be_persisted }
+        it { expect(subject.commit).to eq @commit2 }
       end
     end
   end
diff --git a/spec/services/event_service_spec.rb b/spec/services/event_service_spec.rb
index 1d41673..3333c19 100644
--- a/spec/services/event_service_spec.rb
+++ b/spec/services/event_service_spec.rb
@@ -12,7 +12,7 @@ describe EventService do
     it "creates event" do
       described_class.new.remove_project(user, project)
 
-      Event.admin.last.description.should eq "Project \"GitLab / gitlab-shell\" has been removed by root"
+      expect(Event.admin.last.description).to eq "Project \"GitLab / gitlab-shell\" has been removed by root"
     end
   end
 
@@ -20,7 +20,7 @@ describe EventService do
     it "creates event" do
       described_class.new.create_project(user, project)
 
-      Event.admin.last.description.should eq "Project \"GitLab / gitlab-shell\" has been created by root"
+      expect(Event.admin.last.description).to eq "Project \"GitLab / gitlab-shell\" has been created by root"
     end
   end
 
@@ -28,7 +28,7 @@ describe EventService do
     it "creates event" do
       described_class.new.change_project_settings(user, project)
 
-      Event.last.description.should eq "User \"root\" updated projects settings"
+      expect(Event.last.description).to eq "User \"root\" updated projects settings"
     end
   end
 end
diff --git a/spec/services/image_for_build_service_spec.rb b/spec/services/image_for_build_service_spec.rb
index af85904..d9c9c76 100644
--- a/spec/services/image_for_build_service_spec.rb
+++ b/spec/services/image_for_build_service_spec.rb
@@ -13,34 +13,34 @@ describe ImageForBuildService do
       before { build.run! }
       let(:image) { service.execute(project, ref: 'master') }
 
-      it { image.should be_kind_of(OpenStruct) }
-      it { image.path.to_s.should include('public/build-running.svg') }
-      it { image.name.should eq 'build-running.svg' }
+      it { expect(image).to be_kind_of(OpenStruct) }
+      it { expect(image.path.to_s).to include('public/build-running.svg') }
+      it { expect(image.name).to eq 'build-running.svg' }
     end
 
     context 'unknown branch name' do
       let(:image) { service.execute(project, ref: 'feature') }
 
-      it { image.should be_kind_of(OpenStruct) }
-      it { image.path.to_s.should include('public/build-unknown.svg') }
-      it { image.name.should eq 'build-unknown.svg' }
+      it { expect(image).to be_kind_of(OpenStruct) }
+      it { expect(image.path.to_s).to include('public/build-unknown.svg') }
+      it { expect(image.name).to eq 'build-unknown.svg' }
     end
 
     context 'commit sha' do
       before { build.run! }
       let(:image) { service.execute(project, sha: build.sha) }
 
-      it { image.should be_kind_of(OpenStruct) }
-      it { image.path.to_s.should include('public/build-running.svg') }
-      it { image.name.should eq 'build-running.svg' }
+      it { expect(image).to be_kind_of(OpenStruct) }
+      it { expect(image.path.to_s).to include('public/build-running.svg') }
+      it { expect(image.name).to eq 'build-running.svg' }
     end
 
     context 'unknown commit sha' do
       let(:image) { service.execute(project, sha: '0000000') }
 
-      it { image.should be_kind_of(OpenStruct) }
-      it { image.path.to_s.should include('public/build-unknown.svg') }
-      it { image.name.should eq 'build-unknown.svg' }
+      it { expect(image).to be_kind_of(OpenStruct) }
+      it { expect(image.path.to_s).to include('public/build-unknown.svg') }
+      it { expect(image.name).to eq 'build-unknown.svg' }
     end
   end
 end
diff --git a/spec/services/register_build_service_spec.rb b/spec/services/register_build_service_spec.rb
index 4202335..ee8e499 100644
--- a/spec/services/register_build_service_spec.rb
+++ b/spec/services/register_build_service_spec.rb
@@ -18,29 +18,29 @@ describe RegisterBuildService do
         pending_build.tag_list = ["linux"]
         pending_build.save
         specific_runner.tag_list = ["linux"]
-        service.execute(specific_runner).should eq pending_build
+        expect(service.execute(specific_runner)).to eq pending_build
       end
 
       it "does not pick build with different tag" do
         pending_build.tag_list = ["linux"]
         pending_build.save
         specific_runner.tag_list = ["win32"]
-        service.execute(specific_runner).should be_falsey
+        expect(service.execute(specific_runner)).to be_falsey
       end
 
       it "picks build without tag" do
-        service.execute(specific_runner).should eq pending_build
+        expect(service.execute(specific_runner)).to eq pending_build
       end
 
       it "does not pick build with tag" do
         pending_build.tag_list = ["linux"]
         pending_build.save
-        service.execute(specific_runner).should be_falsey
+        expect(service.execute(specific_runner)).to be_falsey
       end
 
       it "pick build without tag" do
         specific_runner.tag_list = ["win32"]
-        service.execute(specific_runner).should eq pending_build
+        expect(service.execute(specific_runner)).to eq pending_build
       end
     end
 
@@ -53,19 +53,19 @@ describe RegisterBuildService do
       context 'shared runner' do
         let(:build) { service.execute(shared_runner) }
 
-        it { build.should be_kind_of(Build) }
-        it { build.should be_valid }
-        it { build.should be_running }
-        it { build.runner.should eq shared_runner }
+        it { expect(build).to be_kind_of(Build) }
+        it { expect(build).to be_valid }
+        it { expect(build).to be_running }
+        it { expect(build.runner).to eq shared_runner }
       end
 
       context 'specific runner' do
         let(:build) { service.execute(specific_runner) }
 
-        it { build.should be_kind_of(Build) }
-        it { build.should be_valid }
-        it { build.should be_running }
-        it { build.runner.should eq specific_runner }
+        it { expect(build).to be_kind_of(Build) }
+        it { expect(build).to be_valid }
+        it { expect(build).to be_running }
+        it { expect(build.runner).to eq specific_runner }
       end
     end
 
@@ -73,16 +73,16 @@ describe RegisterBuildService do
       context 'shared runner' do
         let(:build) { service.execute(shared_runner) }
 
-        it { build.should be_nil }
+        it { expect(build).to be_nil }
       end
 
       context 'specific runner' do
         let(:build) { service.execute(specific_runner) }
 
-        it { build.should be_kind_of(Build) }
-        it { build.should be_valid }
-        it { build.should be_running }
-        it { build.runner.should eq specific_runner }
+        it { expect(build).to be_kind_of(Build) }
+        it { expect(build).to be_valid }
+        it { expect(build).to be_running }
+        it { expect(build.runner).to eq specific_runner }
       end
     end
   end
diff --git a/spec/services/web_hook_service_spec.rb b/spec/services/web_hook_service_spec.rb
index fae6d5a..93f5b4f 100644
--- a/spec/services/web_hook_service_spec.rb
+++ b/spec/services/web_hook_service_spec.rb
@@ -9,13 +9,13 @@ describe WebHookService do
   describe '#execute' do
     it "should execute successfully" do
       stub_request(:post, hook.url).to_return(status: 200)
-      described_class.new.build_end(build).should be_truthy
+      expect(described_class.new.build_end(build)).to be_truthy
     end
   end
 
   context 'build_data' do
     it "contains all needed fields" do
-      build_data(build).should include(
+      expect(build_data(build)).to include(
         :build_id,
         :project_id,
         :ref,