Merge branch 'feature/reliable-rspec-with-eval-script' into 'master'

Check for element before execute_script

See merge request gitlab-org/gitlab-ce!14898

2 files changed, 1 insertions, 19 deletions

diff --git a/features/steps/project/issues/filter_labels.rb b/features/steps/project/issues/filter_labels.rb
index d34fa694789..b467af53c98 100644
--- a/features/steps/project/issues/filter_labels.rb
+++ b/features/steps/project/issues/filter_labels.rb
@@ -28,12 +28,6 @@ class Spinach::Features::ProjectIssuesFilterLabels < Spinach::FeatureSteps
     end
   end
 
-  step 'I click link "bug"' do
-    page.find('.js-label-select', visible: true).click
-    sleep 0.5
-    execute_script("$('.dropdown-menu-labels li:contains(\"bug\") a').click()")
-  end
-
   step 'I click "dropdown close button"' do
     page.first('.labels-filter .dropdown-title .dropdown-menu-close-icon').click
     sleep 2
diff --git a/features/steps/project/source/browse_files.rb b/features/steps/project/source/browse_files.rb
index 621cae5d80d..6e04f09f322 100644
--- a/features/steps/project/source/browse_files.rb
+++ b/features/steps/project/source/browse_files.rb
@@ -46,10 +46,6 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps
     expect(page).to have_content new_gitignore_content
   end
 
-  step 'I should see its content with new lines preserved at end of file' do
-    expect(evaluate_script('ace.edit("editor").getValue()')).to eq "Sample\n\n\n"
-  end
-
   step 'I click link "Raw"' do
     click_link 'Open raw'
   end
@@ -70,20 +66,11 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps
     click_link 'Fork'
   end
 
-  step 'I can edit code' do
-    set_new_content
-    expect(evaluate_script('ace.edit("editor").getValue()')).to eq new_gitignore_content
-  end
-
   step 'I edit code' do
     expect(page).to have_selector('.file-editor')
     set_new_content
   end
 
-  step 'I edit code with new lines at end of file' do
-    execute_script('ace.edit("editor").setValue("Sample\n\n\n")')
-  end
-
   step 'I fill the new file name' do
     fill_in :file_name, with: new_file_name
   end
@@ -395,6 +382,7 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps
   private
 
   def set_new_content
+    find('#editor')
     execute_script("ace.edit('editor').setValue('#{new_gitignore_content}')")
   end