1 files changed, 26 insertions, 29 deletions

diff --git a/spec/features/projects/blobs/edit_spec.rb b/spec/features/projects/blobs/edit_spec.rb
index 6e335871ed1..e8a9edcc0cc 100644
--- a/spec/features/projects/blobs/edit_spec.rb
+++ b/spec/features/projects/blobs/edit_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe 'Editing file blob', :js, feature_category: :projects do
+RSpec.describe 'Editing file blob', :js, feature_category: :groups_and_projects do
   include Features::SourceEditorSpecHelpers
   include TreeHelper
   include Features::BlobSpecHelpers
@@ -23,15 +23,11 @@ RSpec.describe 'Editing file blob', :js, feature_category: :projects do
     end
 
     def edit_and_commit(commit_changes: true, is_diff: false)
-      set_default_button('edit')
-      refresh
-      wait_for_requests
-
       if is_diff
         first('.js-diff-more-actions').click
         click_link('Edit in single-file editor')
       else
-        click_link('Edit')
+        edit_in_single_file_editor
       end
 
       fill_editor(content: 'class NextFeature\\nend\\n')
@@ -83,29 +79,20 @@ RSpec.describe 'Editing file blob', :js, feature_category: :projects do
     end
 
     context 'blob edit toolbar' do
-      toolbar_buttons = [
-        "Add bold text",
-        "Add italic text",
-        "Add strikethrough text",
-        "Insert a quote",
-        "Insert code",
-        "Add a link",
-        "Add a bullet list",
-        "Add a numbered list",
-        "Add a checklist",
-        "Add a collapsible section",
-        "Add a table"
-      ]
-
-      it "does not have any buttons" do
-        stub_feature_flags(source_editor_toolbar: true)
-        visit project_edit_blob_path(project, tree_join(branch, readme_file_path))
-        buttons = page.all('.file-buttons .md-header-toolbar button[type="button"]')
-        expect(buttons.length).to eq(0)
-      end
-
-      it "has defined set of toolbar buttons when the flag is off" do
-        stub_feature_flags(source_editor_toolbar: false)
+      def has_toolbar_buttons
+        toolbar_buttons = [
+          "Add bold text",
+          "Add italic text",
+          "Add strikethrough text",
+          "Insert a quote",
+          "Insert code",
+          "Add a link",
+          "Add a bullet list",
+          "Add a numbered list",
+          "Add a checklist",
+          "Add a collapsible section",
+          "Add a table"
+        ]
         visit project_edit_blob_path(project, tree_join(branch, readme_file_path))
         buttons = page.all('.file-buttons .md-header-toolbar button[type="button"]')
         expect(buttons.length).to eq(toolbar_buttons.length)
@@ -113,6 +100,16 @@ RSpec.describe 'Editing file blob', :js, feature_category: :projects do
           expect(buttons[i]['title']).to include(button_title)
         end
       end
+
+      it "has defined set of toolbar buttons when the flag is on" do
+        stub_feature_flags(source_editor_toolbar: true)
+        has_toolbar_buttons
+      end
+
+      it "has defined set of toolbar buttons when the flag is off" do
+        stub_feature_flags(source_editor_toolbar: false)
+        has_toolbar_buttons
+      end
     end
 
     context 'from blob file path' do