Merge branch 'master' into 2-0-stable-Mar6

spec/features/admin/bulk_order_management_spec.rb

@@ -45,6 +45,7 @@ feature %q{
 
       before :each do
         visit '/admin/orders/bulk_management'
+        wait_until { request_monitor_finished 'LineItemsCtrl' }
       end
 
       it "displays a column for user's full name" do
@@ -92,6 +93,7 @@ feature %q{
 
       before do
         visit spree.admin_bulk_order_management_path
+        wait_until { request_monitor_finished 'LineItemsCtrl' }
       end
 
       it "sorts by customer name when the customer name header is clicked" do
@@ -260,6 +262,7 @@ feature %q{
 
         before :each do
           visit '/admin/orders/bulk_management'
+          wait_until { request_monitor_finished 'LineItemsCtrl' }
         end
 
         it "displays a select box for producers, which filters line items by the selected supplier" do
@@ -298,6 +301,7 @@ feature %q{
 
         before :each do
           visit '/admin/orders/bulk_management'
+          wait_until { request_monitor_finished 'LineItemsCtrl' }
         end
 
         it "displays a select box for distributors, which filters line items by the selected distributor" do
@@ -337,6 +341,7 @@ feature %q{
 
         before do
           visit '/admin/orders/bulk_management'
+          wait_until { request_monitor_finished 'LineItemsCtrl' }
         end
 
         it "displays a select box for order cycles, which filters line items by the selected order cycle" do
@@ -377,6 +382,7 @@ feature %q{
 
         before :each do
           visit '/admin/orders/bulk_management'
+          wait_until { request_monitor_finished 'LineItemsCtrl' }
         end
 
         it "allows filters to be used in combination" do
@@ -427,6 +433,7 @@ feature %q{
 
       before :each do
         visit '/admin/orders/bulk_management'
+        wait_until { request_monitor_finished 'LineItemsCtrl' }
       end
 
       it "displays a quick search input" do
@@ -456,6 +463,7 @@ feature %q{
 
       before :each do
         visit '/admin/orders/bulk_management'
+        wait_until { request_monitor_finished 'LineItemsCtrl' }
       end
 
       it "displays date fields for filtering orders, with default values set" do
@@ -528,6 +536,7 @@ feature %q{
 
       before :each do
         visit '/admin/orders/bulk_management'
+        wait_until { request_monitor_finished 'LineItemsCtrl' }
       end
 
       it "displays a checkbox for each line item in the list" do
@@ -570,6 +579,7 @@ feature %q{
           expect(page).to have_no_selector "tr#li_#{li2.id}"
           check "toggle_bulk"
           fill_in "quick_search", with: ''
+          wait_until { request_monitor_finished 'LineItemsCtrl' }
           expect(find("tr#li_#{li1.id} input[type='checkbox'][name='bulk']").checked?).to be true
           expect(find("tr#li_#{li2.id} input[type='checkbox'][name='bulk']").checked?).to be false
           expect(find("input[type='checkbox'][name='toggle_bulk']").checked?).to be false
@@ -583,6 +593,7 @@ feature %q{
           find("div#bulk-actions-dropdown div.menu_item", :text => "Delete Selected" ).click
           expect(page).to have_no_selector "tr#li_#{li1.id}"
           fill_in "quick_search", with: ''
+          wait_until { request_monitor_finished 'LineItemsCtrl' }
           expect(page).to have_selector "tr#li_#{li2.id}"
           expect(page).to have_no_selector "tr#li_#{li1.id}"
         end

spec/features/admin/order_cycles_spec.rb

@@ -117,7 +117,7 @@ feature %q{
   end
 
   describe 'listing order cycles with other locales' do
-    let!(:oc_de) { create(:simple_order_cycle, name: 'oc', orders_open_at: '2012-01-01 00:00:00') }
+    let!(:oc_de) { create(:simple_order_cycle, name: 'oc', orders_open_at: '2012-01-01 00:00') }
 
     around(:each) do |spec|
       I18n.locale = :de
@@ -131,7 +131,7 @@ feature %q{
         visit admin_order_cycles_path
 
         within("tr.order-cycle-#{oc_de.id}") do
-          expect(find('input.datetimepicker', match: :first).value).to start_with '2012-01-01 00:00:00'
+          expect(find('input.datetimepicker', match: :first).value).to start_with '2012-01-01 00:00'
           find('img.ui-datepicker-trigger', match: :first).click
         end
 
@@ -143,7 +143,7 @@ feature %q{
         end
 
         within("tr.order-cycle-#{oc_de.id}") do
-          expect(find('input.datetimepicker', match: :first).value).to eq '2012-01-30 00:00:00'
+          expect(find('input.datetimepicker', match: :first).value).to eq '2012-01-30 00:00'
         end
       end
     end
@@ -556,7 +556,7 @@ feature %q{
 
     within("tr.order-cycle-#{oc3.id}") do
       # Then that date/time should appear on the form
-      expect(find("input#oc#{oc3.id}_orders_open_at").value).to eq "2040-12-01 00:00:00"
+      expect(find("input#oc#{oc3.id}_orders_open_at").value).to eq "2040-12-01 00:00"
 
       # Manually fill out time
       find("input#oc#{oc3.id}_name").set "Updated Order Cycle 3"

spec/features/admin/product_import_spec.rb

@@ -462,7 +462,7 @@ feature "Product Import", js: true do
 
   def proceed_to_validation
     expect(page).to have_selector 'a.button.proceed', visible: true
-    click_link I18n.t('admin.product_import.import.import')
+    within("#content") { click_link I18n.t('admin.product_import.import.import') }
     expect(page).to have_selector 'form.product-import', visible: true
     expect(page).to have_content I18n.t('admin.product_import.import.validation_overview')
   end

spec/features/admin/shipping_methods_spec.rb

@@ -109,9 +109,8 @@ feature 'shipping methods' do
 
       click_button I18n.t("actions.create")
 
-      expect(page).to have_no_button I18n.t("actions.create")
-      message = "Shipping method \"Teleport\" has been successfully created!"
-      expect(page).to have_flash_message message
+      expect(page).to have_content I18n.t('editing_shipping_method')
+      expect(flash_message).to eq I18n.t('successfully_created', resource: 'Shipping method "Teleport"')
 
       expect(first('tags-input .tag-list ti-tag-item')).to have_content "local"