From 41837eb31d249880d958626eaeeedf37e57a2f0d Mon Sep 17 00:00:00 2001
From: Bing Xie <bing708@gmail.com>
Date: Wed, 25 May 2016 14:55:00 +1000
Subject: [PATCH] Tweak create order cycle spec

---
 app/views/admin/enterprises/_ng_form.html.haml |  5 -----
 spec/features/admin/order_cycles_spec.rb       | 12 ++++++++++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/views/admin/enterprises/_ng_form.html.haml b/app/views/admin/enterprises/_ng_form.html.haml
index 656d105587..3914cc1df2 100644
--- a/app/views/admin/enterprises/_ng_form.html.haml
+++ b/app/views/admin/enterprises/_ng_form.html.haml
@@ -16,8 +16,3 @@
       .one.column &nbsp;
       .eleven.columns.omega.fullwidth_inputs
         = render 'form', f: f
-  -# .row
-  -#   .five.columns.alpha
-  -#     &nbsp;
-  -#   .eleven.columns.alpha
-  -#     = render partial: "spree/admin/shared/#{action}_resource_links"
diff --git a/spec/features/admin/order_cycles_spec.rb b/spec/features/admin/order_cycles_spec.rb
index e843e00235..74b2e88453 100644
--- a/spec/features/admin/order_cycles_spec.rb
+++ b/spec/features/admin/order_cycles_spec.rb
@@ -59,6 +59,8 @@ feature %q{
   end
 
   scenario "creating an order cycle", js: true do
+    page.driver.resize(1280, 2000)
+
     # Given coordinating, supplying and distributing enterprises with some products with variants
     coordinator = create(:distributor_enterprise, name: 'My coordinator')
     supplier = create(:supplier_enterprise, name: 'My supplier')
@@ -139,7 +141,7 @@ feature %q{
     select 'Distributor fee', from: 'order_cycle_outgoing_exchange_0_enterprise_fees_0_enterprise_fee_id'
 
     # And I click Create
-    find_button('Create').trigger('click')
+    click_button 'Create'
 
     # Then my order cycle should have been created
     page.should have_content 'Your order cycle has been created.'
@@ -567,6 +569,9 @@ feature %q{
       end
 
       scenario "creating a new order cycle" do
+        # Make the page long enough to avoid the save bar overlaying the form
+        page.driver.resize(1280, 2000)
+
         click_link "Order Cycles"
         click_link 'New Order Cycle'
 
@@ -839,6 +844,9 @@ feature %q{
     end
 
     it "creates order cycles", js: true do
+      # Make the page long enough to avoid the save bar overlaying the form
+      page.driver.resize(1280, 2000)
+
       # When I go to the new order cycle page
       visit admin_order_cycles_path
       click_link 'New Order Cycle'
@@ -866,7 +874,7 @@ feature %q{
       page.should_not have_select 'order_cycle_coordinator_fee_1_id'
 
       select 'Coord fee', from: 'order_cycle_coordinator_fee_0_id'
-      find_button('Create').trigger("click")
+      click_button 'Create'
 
       # Then my order cycle should have been created
       page.should have_content 'Your order cycle has been created.'