1 files changed, 38 insertions, 34 deletions
diff --git a/qa/qa/specs/features/browser_ui/3_create/merge_request/squash_merge_request_spec.rb b/qa/qa/specs/features/browser_ui/3_create/merge_request/squash_merge_request_spec.rb
index 3ecc36a5ae1..b5b8855a35d 100644
--- a/qa/qa/specs/features/browser_ui/3_create/merge_request/squash_merge_request_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/merge_request/squash_merge_request_spec.rb
@@ -1,48 +1,52 @@
-module QA
-  describe 'merge request squash commits' do
-    it 'when squash commits is marked before merge'  do
-      Runtime::Browser.visit(:gitlab, Page::Main::Login)
-      Page::Main::Login.act { sign_in_using_credentials }
+# frozen_string_literal: true
 
-      project = Factory::Resource::Project.fabricate! do |project|
-        project.name = "squash-before-merge"
-      end
+module QA
+  context :create do
+    describe 'Merge request squashing' do
+      it 'user squashes commits while merging'  do
+        Runtime::Browser.visit(:gitlab, Page::Main::Login)
+        Page::Main::Login.act { sign_in_using_credentials }
+
+        project = Factory::Resource::Project.fabricate! do |project|
+          project.name = "squash-before-merge"
+        end
 
-      merge_request = Factory::Resource::MergeRequest.fabricate! do |merge_request|
-        merge_request.project = project
-        merge_request.title = 'Squashing commits'
-      end
+        merge_request = Factory::Resource::MergeRequest.fabricate! do |merge_request|
+          merge_request.project = project
+          merge_request.title = 'Squashing commits'
+        end
 
-      Factory::Repository::ProjectPush.fabricate! do |push|
-        push.project = project
-        push.commit_message = 'to be squashed'
-        push.branch_name = merge_request.source_branch
-        push.new_branch = false
-        push.file_name = 'other.txt'
-        push.file_content = "Test with unicode characters ❤✓€❄"
-      end
+        Factory::Repository::ProjectPush.fabricate! do |push|
+          push.project = project
+          push.commit_message = 'to be squashed'
+          push.branch_name = merge_request.source_branch
+          push.new_branch = false
+          push.file_name = 'other.txt'
+          push.file_content = "Test with unicode characters ❤✓€❄"
+        end
 
-      merge_request.visit!
+        merge_request.visit!
 
-      expect(page).to have_text('to be squashed')
+        expect(page).to have_text('to be squashed')
 
-      Page::MergeRequest::Show.perform do |merge_request_page|
-        merge_request_page.mark_to_squash
-        merge_request_page.merge!
+        Page::MergeRequest::Show.perform do |merge_request_page|
+          merge_request_page.mark_to_squash
+          merge_request_page.merge!
 
-        merge_request.project.visit!
+          merge_request.project.visit!
 
-        Git::Repository.perform do |repository|
-          repository.uri = Page::Project::Show.act do
-            choose_repository_clone_http
-            repository_location.uri
-          end
+          Git::Repository.perform do |repository|
+            repository.uri = Page::Project::Show.act do
+              choose_repository_clone_http
+              repository_location.uri
+            end
 
-          repository.use_default_credentials
+            repository.use_default_credentials
 
-          repository.act { clone }
+            repository.act { clone }
 
-          expect(repository.commits.size).to eq 3
+            expect(repository.commits.size).to eq 3
+          end
         end
       end
     end