Update core/app/views/spree/shared/_google_analytics.html.erb

If an error occurs during the final page of the checkout  - order_path(@order), this leaves the flash[:commerce_tracking] set. So when the user goes back to the home page or any subsequent page, the pages will throw an nil exception on <%= @order.number %> because the framework sees that the flash[:commerce_tracking] hasn't been cleared.

The fix is to also check that @order is present.

Fixes #2287
Try the current user's email when signing up in analytics
Must set commerce_tracking for analytics_helper completed order spec
Force change event for country select box in states_spec to trigger
Wait a little while (for the page to load) in select2 helper method

Conflicts:

	core/spec/support/capybara_ext.rb
checkout_steps will always include complete step
Add a wait_until for product_properties spec
Add a wait_until for option_types spec
Add a sleep to select2 so that taxons_spec works
Use set_select2_field to fill in select field in customer_details_spec
Fix issue where name in customer_details_spec wasn't unique enough for the dropdown
Wait for select2-highlighted box to appear
Add select2 + set_select2_field helpers to promo
[promo] Use set_select2_field to fix order promotion tests
[promo] Use select2 helpers to fix promotion_adjustments_spec tests
Ensure defaults preferences are returned when persistance is disable for default perference store
Remove debugger
[dash] Automatically set up jirafe when visiting admin for the first
time
Add a sleep to promotion_adjustments_spec
Ensure defaults preferences are returned when persistance is disable for default perference store