Fix resolve service specs

98dd958d · Sean McGivern · Alfredo Sumaran · 082be091 · 98dd958d
Commit 98dd958d authored Sep 01, 2016 by Sean McGivern Committed by Alfredo Sumaran Oct 13, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

spec/services/merge_requests/resolve_service_spec.rb spec/services/merge_requests/resolve_service_spec.rb +2 -2

No files found.
--- a/spec/services/merge_requests/resolve_service_spec.rb
+++ b/spec/services/merge_requests/resolve_service_spec.rb
@@ -60,7 +60,7 @@ describe MergeRequests::ResolveService do
        it 'creates a commit with the correct parents' do
          expect(merge_request.source_branch_head.parents.map(&:id)).
            to eq(['1450cd639e0bc6721eb02800169e464f212cde06',
-                   '75284c70dd26c87f2a3fb65fd5a1f0b0138d3a6b'])
+                   '824be604a34828eb682305f0d963056cfac87b2d'])
        end
      end

@@ -120,7 +120,7 @@ describe MergeRequests::ResolveService do
      it 'creates a commit with the correct parents' do
        expect(merge_request.source_branch_head.parents.map(&:id)).
          to eq(['1450cd639e0bc6721eb02800169e464f212cde06',
-                 '75284c70dd26c87f2a3fb65fd5a1f0b0138d3a6b'])
+                 '824be604a34828eb682305f0d963056cfac87b2d'])
      end

      it 'sets the content to the content given' do