Upgrade rspec-rails to 3.8.2 and dependenciessh-bump-rspec-versions

This brings the rspec-core version in line with the Gitaly changes
and introduces Rails 5.1/5.2 improvements.

Full CHANGELOG:
https://github.com/rspec/rspec-rails/blob/master/Changelog.md

1 files changed, 6 insertions, 2 deletions

diff --git a/spec/services/merge_requests/mergeability_check_service_spec.rb b/spec/services/merge_requests/mergeability_check_service_spec.rb
index 6efece64092..6e827f2ea5b 100644
--- a/spec/services/merge_requests/mergeability_check_service_spec.rb
+++ b/spec/services/merge_requests/mergeability_check_service_spec.rb
@@ -11,7 +11,11 @@ describe MergeRequests::MergeabilityCheckService do
     end
 
     it 'does not change the merge ref HEAD' do
-      expect { subject }.not_to change(merge_request, :merge_ref_head)
+      merge_ref_head = merge_request.merge_ref_head
+
+      subject
+
+      expect(merge_request.reload.merge_ref_head).to eq merge_ref_head
     end
 
     it 'returns ServiceResponse.error' do
@@ -73,7 +77,7 @@ describe MergeRequests::MergeabilityCheckService do
 
       it 'second call does not change the merge-ref' do
         expect { subject }.to change(merge_request, :merge_ref_head).from(nil)
-        expect { subject }.not_to change(merge_request, :merge_ref_head)
+        expect { subject }.not_to change(merge_request.merge_ref_head, :id)
       end
     end