Merge pull request #3040 from projectblacklight/3039-flappy-tests

Wait for data to load in flappy test

spec/features/javascript/blocks/solr_documents_block_spec.rb

@@ -84,24 +84,26 @@
   end
 
   it 'allows you to toggle visibility of solr documents', js: true do
-    skip('Passes locally, but soooo flakey in CI.') if ENV['CI']
     fill_in_solr_document_block_typeahead_field with: 'dq287tq6352'
 
+    # Flappy guard. Wait for the thumbnail src to be populated.
+    expect(page).to have_selector('li[data-resource-id="dq287tq6352"] .img-thumbnail[src^="http"]')
+
     within(:css, '.card') do
       uncheck 'Display?'
     end
 
     fill_in_solr_document_block_typeahead_field with: 'gk446cj2442'
 
+    # Flappy guard. Wait for the thumbnail src to be populated.
+    expect(page).to have_selector('li[data-resource-id="gk446cj2442"] .img-thumbnail[src^="http"]')
+
     # display the title as the primary caption
     within('.primary-caption') do
       check('Primary caption')
       select('Title', from: 'primary-caption-field')
     end
 
-    # this seems silly, but also seems to help with the flappy-ness of this spec
-    expect(find_field('Primary caption', checked: true)).to be_checked
-
     save_page
 
     expect(page).to have_selector '.items-block .box', count: 1, visible: true
@@ -114,9 +116,6 @@
       uncheck('Primary caption')
     end
 
-    # this seems silly, but also seems to help with the flappy-ness of this spec
-    expect(find_field('Primary caption', checked: false)).not_to be_checked
-
     save_page
 
     expect(page).to have_selector '.items-block .box', count: 1, visible: true
@@ -148,13 +147,12 @@
   end
 
   it 'allows you to optionally display a ZPR link with the image', js: true do
-    skip('Passes locally, but soooo flakey on Travis.') if ENV['CI']
-
     fill_in_solr_document_block_typeahead_field with: 'gk446cj2442'
 
+    # Flappy guard. Wait for the thumbnail src to be populated.
+    expect(page).to have_selector('li[data-resource-id="gk446cj2442"] .img-thumbnail[src^="http"]')
+
     check 'Offer "View larger" option'
-    # this seems silly, but also seems to help with the flappy-ness of this spec
-    expect(find_field('Offer "View larger" option', checked: true)).to be_checked
 
     save_page
 
@@ -182,13 +180,13 @@
   end
 
   it 'allows you to choose which side the text will be on', js: true do
-    skip('Passes locally, but soooo flakey on Travis.') if ENV['CI']
     fill_in_solr_document_block_typeahead_field with: 'dq287tq6352'
 
+    # Flappy guard. Wait for the thumbnail src to be populated.
+    expect(page).to have_selector('li[data-resource-id="dq287tq6352"] .img-thumbnail[src^="http"]')
+
     # Select to align the text right
     choose 'Left'
-    # this seems silly, but also seems to help with the flappy-ness of this spec
-    expect(find_field('Left', checked: true)).to be_checked
 
     # fill in the content editable div
     content_editable = find('.st-text-block')
@@ -209,12 +207,18 @@
   it 'round-trip data', js: true do
     fill_in_solr_document_block_typeahead_field with: 'dq287tq6352'
 
+    # Flappy guard. Wait for the thumbnail src to be populated.
+    expect(page).to have_selector('li[data-resource-id="dq287tq6352"] .img-thumbnail[src^="http"]')
+
     within(:css, '.card') do
       uncheck 'Display?'
     end
 
     fill_in_solr_document_block_typeahead_field with: 'gk446cj2442'
 
+    # Flappy guard. Wait for the thumbnail src to be populated.
+    expect(page).to have_selector('li[data-resource-id="gk446cj2442"] .img-thumbnail[src^="http"]')
+
     # display the title as the primary caption
     within('.primary-caption') do
       check('Primary caption')

spec/features/javascript/blocks/uploaded_items_block_spec.rb

@@ -71,8 +71,10 @@
     attach_file('uploaded_item_url', fixture_file2)
 
     check 'Offer "View larger" option'
-    # this seems silly, but also seems to help with the flappy-ness of this spec
-    expect(find_field('Offer "View larger" option', checked: true)).to be_checked
+
+    # Flappy guards. Wait for the thumbnail src to be populated.
+    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