1 files changed, 2 insertions, 2 deletions
diff --git a/spec/features/merge_request/user_resolves_conflicts_spec.rb b/spec/features/merge_request/user_resolves_conflicts_spec.rb
index 5fc65f020d3..41a7456aed5 100644
--- a/spec/features/merge_request/user_resolves_conflicts_spec.rb
+++ b/spec/features/merge_request/user_resolves_conflicts_spec.rb
@@ -183,14 +183,14 @@ describe 'Merge request > User resolves conflicts', :js do
     end
   end
 
-  UNRESOLVABLE_CONFLICTS = {
+  unresolvable_conflicts = {
     'conflict-too-large' => 'when the conflicts contain a large file',
     'conflict-binary-file' => 'when the conflicts contain a binary file',
     'conflict-missing-side' => 'when the conflicts contain a file edited in one branch and deleted in another',
     'conflict-non-utf8' => 'when the conflicts contain a non-UTF-8 file'
   }.freeze
 
-  UNRESOLVABLE_CONFLICTS.each do |source_branch, description|
+  unresolvable_conflicts.each do |source_branch, description|
     context description do
       let(:merge_request) { create_merge_request(source_branch) }