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:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-01-07 05:05:10 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-01-07 05:05:10 +0300
commitee9849b7363c7bda9d81a73ca1f1351414607e3e (patch)
treea633e1db9ad036869eb3b0a8e3fcf162f4b66f02 /spec/services/merge_requests
parent7eeec5e45a3f56ee6b05985962eb88d733b6beb2 (diff)
Improve mr refresh service tests
Diffstat (limited to 'spec/services/merge_requests')
-rw-r--r--spec/services/merge_requests/refresh_service_spec.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/services/merge_requests/refresh_service_spec.rb b/spec/services/merge_requests/refresh_service_spec.rb
index 9f294152053..35c7aac94df 100644
--- a/spec/services/merge_requests/refresh_service_spec.rb
+++ b/spec/services/merge_requests/refresh_service_spec.rb
@@ -47,10 +47,10 @@ describe MergeRequests::RefreshService do
reload_mrs
end
- it { @merge_request.notes.should be_empty }
+ 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.should be_empty }
+ it { @fork_merge_request.notes.last.note.should include('changed to merged') }
end
context 'push to fork repo source branch' do
@@ -61,7 +61,7 @@ describe MergeRequests::RefreshService do
it { @merge_request.notes.should be_empty }
it { @merge_request.should be_open }
- it { @fork_merge_request.notes.should_not be_empty }
+ it { @fork_merge_request.notes.last.note.should include('new commit') }
it { @fork_merge_request.should be_open }
end
@@ -84,7 +84,7 @@ describe MergeRequests::RefreshService do
reload_mrs
end
- it { @merge_request.notes.should be_empty }
+ 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 }