\s+#{feature_page1.title}/ feature_page2_position = page.body =~ /
\s+#{feature_page2.title}/ diff --git a/spec/features/javascript/blocks/link_to_search_block_spec.rb b/spec/features/javascript/blocks/link_to_search_block_spec.rb index 00f539596..573f3ac7c 100644 --- a/spec/features/javascript/blocks/link_to_search_block_spec.rb +++ b/spec/features/javascript/blocks/link_to_search_block_spec.rb @@ -27,7 +27,7 @@ fill_in_typeahead_field with: 'Title2' - save_page + save_page_changes # Documents should exist expect(page).to have_no_css('.category-title', text: search1.title) @@ -39,7 +39,7 @@ pending('Prefetched autocomplete does not work the same way as solr-backed autocompletes') uncheck 'Include item counts?' fill_in_typeahead_field with: 'Title1' - save_page + save_page_changes expect(page).to have_no_css('.item-count', text: /\d+ items/i) end diff --git a/spec/features/javascript/blocks/rule_block_spec.rb b/spec/features/javascript/blocks/rule_block_spec.rb index 22d819e3c..8645afa59 100644 --- a/spec/features/javascript/blocks/rule_block_spec.rb +++ b/spec/features/javascript/blocks/rule_block_spec.rb @@ -16,7 +16,7 @@ add_widget 'rule' - save_page + save_page_changes expect(page).to have_css('hr') end diff --git a/spec/features/javascript/blocks/search_result_block_spec.rb b/spec/features/javascript/blocks/search_result_block_spec.rb index 5861b2cee..c9e7b9311 100644 --- a/spec/features/javascript/blocks/search_result_block_spec.rb +++ b/spec/features/javascript/blocks/search_result_block_spec.rb @@ -28,7 +28,7 @@ check 'Gallery' check 'Slideshow' - save_page + save_page_changes expect(page).to have_no_content 'per page' expect(page).to have_no_content 'Sort by' diff --git a/spec/features/javascript/blocks/solr_documents_block_spec.rb b/spec/features/javascript/blocks/solr_documents_block_spec.rb index 5ddee0579..438e4f544 100644 --- a/spec/features/javascript/blocks/solr_documents_block_spec.rb +++ b/spec/features/javascript/blocks/solr_documents_block_spec.rb @@ -33,7 +33,7 @@ expect(page).to have_content "L'AMERIQUE" end - save_page + save_page_changes # verify that the item + image widget is displaying an image from the document. within(:css, '.items-block', visible: true) do @@ -47,7 +47,7 @@ fill_in_solr_document_block_typeahead_field with: 'gk446cj2442' expect(page).to have_selector '.panels li', count: 2, visible: true - save_page + save_page_changes expect(page).to have_selector '.items-block .box', count: 2, visible: true end @@ -62,7 +62,7 @@ find('.thumbs-list li[data-index="1"]').click expect(page).to have_css('[data-panel-image-pagination]', text: /Image 2 of 2/, visible: true) - save_page + save_page_changes # The thumbnail on the rendered block should be correct thumb = find('.img-thumbnail') @@ -76,7 +76,7 @@ thumb = find('.pic .img-thumbnail') expect(thumb['src']).to match(%r{xd327cm9378_05_0002/full}) - save_page + save_page_changes # Expect that the original image selection was retained thumb = find('.img-thumbnail') @@ -104,7 +104,7 @@ select('Title', from: 'primary-caption-field') end - save_page + save_page_changes expect(page).to have_selector '.items-block .box', count: 1, visible: true expect(page).to have_content '[World map]' @@ -116,7 +116,7 @@ uncheck('Primary caption') end - save_page + save_page_changes expect(page).to have_selector '.items-block .box', count: 1, visible: true expect(page).to have_no_content '[World map]' @@ -136,7 +136,7 @@ select('Language', from: 'secondary-caption-field') end # create the page - save_page + save_page_changes # verify that the item + image widget is displaying image and title from the requested document. within(:css, '.items-block', visible: true) do @@ -154,7 +154,7 @@ check 'Offer "View larger" option' - save_page + save_page_changes within '.contents' do click_button 'View [World map] larger' @@ -170,7 +170,7 @@ content_editable = find('.st-text-block') content_editable.set('zzz') # create the page - save_page + save_page_changes # visit the show page for the document we just saved # verify that the item + image widget is displaying image and title from the requested document. @@ -193,7 +193,7 @@ content_editable.set('zzz') # create the page - save_page + save_page_changes # verify that the item + image widget is displaying image and title from the requested document. within(:css, '.items-block') do @@ -231,7 +231,7 @@ # Select to align the text right choose 'Right' - save_page + save_page_changes click_on 'Edit' diff --git a/spec/features/javascript/blocks/solr_documents_carousel_block_spec.rb b/spec/features/javascript/blocks/solr_documents_carousel_block_spec.rb index 51ac9c3b6..04997cb13 100644 --- a/spec/features/javascript/blocks/solr_documents_carousel_block_spec.rb +++ b/spec/features/javascript/blocks/solr_documents_carousel_block_spec.rb @@ -19,7 +19,7 @@ check 'Primary caption' select 'Title', from: 'primary-caption-field' - save_page + save_page_changes within '.carousel-block' do expect(page).to have_css('.carousel-item', count: 1) diff --git a/spec/features/javascript/blocks/uploaded_items_block_spec.rb b/spec/features/javascript/blocks/uploaded_items_block_spec.rb index bff4c0077..f9b869dc7 100644 --- a/spec/features/javascript/blocks/uploaded_items_block_spec.rb +++ b/spec/features/javascript/blocks/uploaded_items_block_spec.rb @@ -36,7 +36,7 @@ expect(page).to have_css('.card-title', text: 'avatar.png') end - save_page + save_page_changes expect(page).to have_css('h3', text: heading) expect(page).to have_css('p', text: text) @@ -59,7 +59,7 @@ # Uncheck the first checkbox all('input[type="checkbox"]').first.click - save_page + save_page_changes within('.uploaded-items-block') do expect(page).to have_css('img[alt=""]', count: 1) @@ -76,7 +76,7 @@ expect(page).to have_selector('li[data-id="file_0"] .img-thumbnail[src^="/"]') expect(page).to have_selector('li[data-id="file_1"] .img-thumbnail[src^="/"]') - save_page + save_page_changes within('.uploaded-items-block') do expect(page).to have_button('View larger', count: 2) diff --git a/spec/features/javascript/multi_image_select_spec.rb b/spec/features/javascript/multi_image_select_spec.rb index 8f8e59ea1..cb9422bc2 100644 --- a/spec/features/javascript/multi_image_select_spec.rb +++ b/spec/features/javascript/multi_image_select_spec.rb @@ -21,7 +21,7 @@ expect(page).to have_link 'Change' end - save_page + save_page_changes visit spotlight.exhibit_feature_page_path(exhibit, feature_page) expect(page).to have_css("[data-id='xd327cm9378']") @@ -41,7 +41,7 @@ all('li')[1].click end - save_page + save_page_changes expect(page).to have_css("[data-id='xd327cm9378']") expect(page).to have_no_css("img[src='https://stacks.stanford.edu/image/iiif/xd327cm9378/xd327cm9378_05_0001/full/!400,400/0/default.jpg']") diff --git a/spec/support/features/test_features_helpers.rb b/spec/support/features/test_features_helpers.rb index d8f56063e..26eba5fa7 100644 --- a/spec/support/features/test_features_helpers.rb +++ b/spec/support/features/test_features_helpers.rb @@ -54,7 +54,7 @@ def click_add_widget first('.st-block-replacer').click end - def save_page + def save_page_changes page.execute_script <<-EOF SirTrevor.getInstance().onFormSubmit(); EOF