summaryrefslogtreecommitdiff
path: root/spec/services/merge_requests
diff options
context:
space:
mode:
Diffstat (limited to 'spec/services/merge_requests')
-rw-r--r--spec/services/merge_requests/build_service_spec.rb2
-rw-r--r--spec/services/merge_requests/conflicts/resolve_service_spec.rb10
2 files changed, 6 insertions, 6 deletions
diff --git a/spec/services/merge_requests/build_service_spec.rb b/spec/services/merge_requests/build_service_spec.rb
index 536d0d345a4..39a97a51962 100644
--- a/spec/services/merge_requests/build_service_spec.rb
+++ b/spec/services/merge_requests/build_service_spec.rb
@@ -19,7 +19,7 @@ describe MergeRequests::BuildService do
let(:merge_request) { service.execute }
let(:compare) { double(:compare, commits: commits) }
let(:commit_1) { double(:commit_1, sha: 'f00ba7', safe_message: "Initial commit\n\nCreate the app") }
- let(:commit_2) { double(:commit_2, sha: 'f00ba7', safe_message: 'This is a bad commit message!') }
+ let(:commit_2) { double(:commit_2, sha: 'f00ba7', safe_message: _('This is a bad commit message!')) }
let(:commits) { nil }
let(:params) do
diff --git a/spec/services/merge_requests/conflicts/resolve_service_spec.rb b/spec/services/merge_requests/conflicts/resolve_service_spec.rb
index 7edf8a96c94..afac3b36f44 100644
--- a/spec/services/merge_requests/conflicts/resolve_service_spec.rb
+++ b/spec/services/merge_requests/conflicts/resolve_service_spec.rb
@@ -48,7 +48,7 @@ describe MergeRequests::Conflicts::ResolveService do
}
}
],
- commit_message: 'This is a commit message!'
+ commit_message: _('This is a commit message!')
}
end
@@ -146,7 +146,7 @@ describe MergeRequests::Conflicts::ResolveService do
}
}
],
- commit_message: 'This is a commit message!'
+ commit_message: _('This is a commit message!')
}
end
@@ -189,7 +189,7 @@ describe MergeRequests::Conflicts::ResolveService do
sections: { '6eb14e00385d2fb284765eb1cd8d420d33d63fc9_9_9' => 'head' }
}
],
- commit_message: 'This is a commit message!'
+ commit_message: _('This is a commit message!')
}
end
@@ -220,7 +220,7 @@ describe MergeRequests::Conflicts::ResolveService do
content: regex_conflict.content
}
],
- commit_message: 'This is a commit message!'
+ commit_message: _('This is a commit message!')
}
end
@@ -240,7 +240,7 @@ describe MergeRequests::Conflicts::ResolveService do
content: ''
}
],
- commit_message: 'This is a commit message!'
+ commit_message: _('This is a commit message!')
}
end