Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen van Baarsen <jeroenvanbaarsen@gmail.com>2015-02-12 21:17:35 +0300
committerJeroen van Baarsen <jeroenvanbaarsen@gmail.com>2015-02-12 21:17:35 +0300
commit0c4a70a306b871899bf87ce4673918abfee4d95f (patch)
treec7a702fb511209ffe0eceba245d1ffea71dce1aa /spec/services/merge_requests/create_service_spec.rb
parentde1c450abd6b367390a1295cac402344f500d41d (diff)
Updated rspec to rspec 3.x syntax
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
Diffstat (limited to 'spec/services/merge_requests/create_service_spec.rb')
-rw-r--r--spec/services/merge_requests/create_service_spec.rb6
1 files changed, 3 insertions, 3 deletions
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)