Use `page.all` and `page.within` in specsrs-expect-syntax-specs

4 files changed, 20 insertions, 20 deletions

diff --git a/spec/features/admin/admin_hooks_spec.rb b/spec/features/admin/admin_hooks_spec.rb
index 00906e8087a..7265cdac7a7 100644
--- a/spec/features/admin/admin_hooks_spec.rb
+++ b/spec/features/admin/admin_hooks_spec.rb
@@ -12,7 +12,7 @@ describe "Admin::Hooks", feature: true do
   describe "GET /admin/hooks" do
     it "should be ok" do
       visit admin_root_path
-      within ".sidebar-wrapper" do
+      page.within ".sidebar-wrapper" do
         click_on "Hooks"
       end
       expect(current_path).to eq(admin_hooks_path)
diff --git a/spec/features/issues_spec.rb b/spec/features/issues_spec.rb
index 66d73b2505c..d803a1805de 100644
--- a/spec/features/issues_spec.rb
+++ b/spec/features/issues_spec.rb
@@ -311,10 +311,10 @@ describe 'Issues', feature: true do
   end
 
   def first_issue
-    all('ul.issues-list li').first.text
+    page.all('ul.issues-list li').first.text
   end
 
   def last_issue
-    all('ul.issues-list li').last.text
+    page.all('ul.issues-list li').last.text
   end
 end
diff --git a/spec/features/notes_on_merge_requests_spec.rb b/spec/features/notes_on_merge_requests_spec.rb
index b69b59d4158..219bb3129e7 100644
--- a/spec/features/notes_on_merge_requests_spec.rb
+++ b/spec/features/notes_on_merge_requests_spec.rb
@@ -22,20 +22,20 @@ describe 'Comments' do
         is_expected.to have_css('.js-main-target-form', visible: true, count: 1)
         expect(find('.js-main-target-form input[type=submit]').value).
           to eq('Add Comment')
-        within('.js-main-target-form') do
+        page.within('.js-main-target-form') do
           expect(page).not_to have_link('Cancel')
         end
       end
 
       describe 'with text' do
         before do
-          within('.js-main-target-form') do
+          page.within('.js-main-target-form') do
             fill_in 'note[note]', with: 'This is awesome'
           end
         end
 
         it 'should have enable submit button and preview button' do
-          within('.js-main-target-form') do
+          page.within('.js-main-target-form') do
             expect(page).not_to have_css('.js-comment-button[disabled]')
             expect(page).to have_css('.js-md-preview-button', visible: true)
           end
@@ -45,7 +45,7 @@ describe 'Comments' do
 
     describe 'when posting a note' do
       before do
-        within('.js-main-target-form') do
+        page.within('.js-main-target-form') do
           fill_in 'note[note]', with: 'This is awsome!'
           find('.js-md-preview-button').click
           click_button 'Add Comment'
@@ -54,11 +54,11 @@ describe 'Comments' do
 
       it 'should be added and form reset' do
         is_expected.to have_content('This is awsome!')
-        within('.js-main-target-form') do
+        page.within('.js-main-target-form') do
           expect(page).to have_no_field('note[note]', with: 'This is awesome!')
           expect(page).to have_css('.js-md-preview', visible: :hidden)
         end
-        within('.js-main-target-form') do
+        page.within('.js-main-target-form') do
           is_expected.to have_css('.js-note-text', visible: true)
         end
       end
@@ -66,7 +66,7 @@ describe 'Comments' do
 
     describe 'when editing a note', js: true do
       it 'should contain the hidden edit form' do
-        within("#note_#{note.id}") do
+        page.within("#note_#{note.id}") do
           is_expected.to have_css('.note-edit-form', visible: false)
         end
       end
@@ -78,7 +78,7 @@ describe 'Comments' do
         end
 
         it 'should show the note edit form and hide the note body' do
-          within("#note_#{note.id}") do
+          page.within("#note_#{note.id}") do
             expect(find('.current-note-edit-form', visible: true)).to be_visible
             expect(find('.note-edit-form', visible: true)).to be_visible
             expect(find(:css, '.note-body > .note-text', visible: false)).not_to be_visible
@@ -95,12 +95,12 @@ describe 'Comments' do
         #end
 
         it 'appends the edited at time to the note' do
-          within('.current-note-edit-form') do
+          page.within('.current-note-edit-form') do
             fill_in 'note[note]', with: 'Some new content'
             find('.btn-save').click
           end
 
-          within("#note_#{note.id}") do
+          page.within("#note_#{note.id}") do
             is_expected.to have_css('.note_edited_ago')
             expect(find('.note_edited_ago').text).
               to match(/less than a minute ago/)
@@ -115,7 +115,7 @@ describe 'Comments' do
         end
 
         it 'shows the delete link' do
-          within('.note-attachment') do
+          page.within('.note-attachment') do
             is_expected.to have_css('.js-note-attachment-delete')
           end
         end
@@ -150,7 +150,7 @@ describe 'Comments' do
         it { is_expected.to have_css('.js-temp-notes-holder') }
 
         it 'has .new_note css class' do
-          within('.js-temp-notes-holder') do
+          page.within('.js-temp-notes-holder') do
             expect(subject).to have_css('.new_note')
           end
         end
@@ -166,7 +166,7 @@ describe 'Comments' do
         end
 
         it 'should be removed when canceled' do
-          within(".diff-file form[rel$='#{line_code}']") do
+          page.within(".diff-file form[rel$='#{line_code}']") do
             find('.js-close-discussion-note-form').trigger('click')
           end
 
@@ -186,11 +186,11 @@ describe 'Comments' do
       describe 'previewing them separately' do
         before do
           # add two separate texts and trigger previews on both
-          within("tr[id='#{line_code}'] + .js-temp-notes-holder") do
+          page.within("tr[id='#{line_code}'] + .js-temp-notes-holder") do
             fill_in 'note[note]', with: 'One comment on line 7'
             find('.js-md-preview-button').click
           end
-          within("tr[id='#{line_code_2}'] + .js-temp-notes-holder") do
+          page.within("tr[id='#{line_code_2}'] + .js-temp-notes-holder") do
             fill_in 'note[note]', with: 'Another comment on line 10'
             find('.js-md-preview-button').click
           end
@@ -199,7 +199,7 @@ describe 'Comments' do
 
       describe 'posting a note' do
         before do
-          within("tr[id='#{line_code_2}'] + .js-temp-notes-holder") do
+          page.within("tr[id='#{line_code_2}'] + .js-temp-notes-holder") do
             fill_in 'note[note]', with: 'Another comment on line 10'
             click_button('Add Comment')
           end
diff --git a/spec/features/search_spec.rb b/spec/features/search_spec.rb
index 73987739a7a..479334f45d8 100644
--- a/spec/features/search_spec.rb
+++ b/spec/features/search_spec.rb
@@ -7,7 +7,7 @@ describe "Search", feature: true  do
     @project.team << [@user, :reporter]
     visit search_path
 
-    within '.search-holder' do
+    page.within '.search-holder' do
       fill_in "search", with: @project.name[0..3]
       click_button "Search"
     end