Merge pull request #259 from SuperGoodSoft/senem/fix-flakey-checkout-spec

Address checkout spec race conditions

Author: jarednorman

spec/features/checkout_spec.rb

@@ -63,7 +63,12 @@
       fill_addresses_fields_with(address)
       click_button 'Save and Continue'
 
+      expect(page).to have_content 'UPS Ground'
+
       click_button 'Save and Continue'
+
+      expect(page).to have_content(/Payment Information/i)
+
       click_button 'Save and Continue'
       click_button 'Place Order'
 
@@ -89,7 +94,12 @@
       fill_addresses_fields_with(address)
       click_button 'Save and Continue'
 
+      expect(page).to have_content 'UPS Ground'
+
       click_button 'Save and Continue'
+
+      expect(page).to have_content(/Payment Information/i)
+
       click_button 'Save and Continue'
       click_button 'Place Order'
 
@@ -145,9 +155,15 @@
       expect(page).to have_text 'You have signed up successfully.'
 
       fill_addresses_fields_with(address)
+
       click_button 'Save and Continue'
 
+      expect(page).to have_content 'UPS Ground'
+
       click_button 'Save and Continue'
+
+      expect(page).to have_content(/Payment Information/i)
+
       click_button 'Save and Continue'
       click_button 'Place Order'