From 33fd88507daa2a12a726a90cfd0c7fad25f37fe4 Mon Sep 17 00:00:00 2001
From: Bing Xie <bing708@gmail.com>
Date: Wed, 25 May 2016 11:26:15 +1000
Subject: [PATCH] Fix failed tests

---
 .../controllers/enterprise_controller.js.coffee |  2 +-
 spec/features/admin/enterprises_spec.rb         | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/admin/enterprises/controllers/enterprise_controller.js.coffee b/app/assets/javascripts/admin/enterprises/controllers/enterprise_controller.js.coffee
index 8b5f261436..f21c96a27e 100644
--- a/app/assets/javascripts/admin/enterprises/controllers/enterprise_controller.js.coffee
+++ b/app/assets/javascripts/admin/enterprises/controllers/enterprise_controller.js.coffee
@@ -1,5 +1,5 @@
 angular.module("admin.enterprises")
-  .controller "enterpriseCtrl", ($scope, $window,NavigationCheck, enterprise, EnterprisePaymentMethods, EnterpriseShippingMethods, SideMenu, StatusMessage) ->
+  .controller "enterpriseCtrl", ($scope, $window, NavigationCheck, enterprise, EnterprisePaymentMethods, EnterpriseShippingMethods, SideMenu, StatusMessage) ->
     $scope.Enterprise = enterprise
     $scope.PaymentMethods = EnterprisePaymentMethods.paymentMethods
     $scope.ShippingMethods = EnterpriseShippingMethods.shippingMethods
diff --git a/spec/features/admin/enterprises_spec.rb b/spec/features/admin/enterprises_spec.rb
index 3579421b84..4d09007584 100644
--- a/spec/features/admin/enterprises_spec.rb
+++ b/spec/features/admin/enterprises_spec.rb
@@ -61,6 +61,9 @@ feature %q{
   end
 
   scenario "editing an existing enterprise", js: true do
+    # Make the page long enough to avoid the save bar overlaying the form
+    page.driver.resize(1280, 1000)
+
     @enterprise = create(:enterprise)
     e2 = create(:enterprise)
     eg1 = create(:enterprise_group, name: 'eg1')
@@ -355,6 +358,10 @@ feature %q{
       within("tbody#e_#{distributor1.id}") { click_link 'Manage' }
 
       fill_in 'enterprise_name', :with => 'Eaterprises'
+
+      # Because poltergist does not support form onchange event
+      # We need trigger the change manually
+      page.evaluate_script("angular.element(enterprise_form).scope().setFormDirty()")
       click_button 'Update'
 
       flash_message.should == 'Enterprise "Eaterprises" has been successfully updated!'
@@ -367,6 +374,10 @@ feature %q{
         within("tbody#e_#{distributor3.id}") { click_link 'Manage' }
 
         fill_in 'enterprise_name', :with => 'Eaterprises'
+
+        # Because poltergist does not support form onchange event
+        # We need trigger the change manually
+        page.evaluate_script("angular.element(enterprise_form).scope().setFormDirty()")
         click_button 'Update'
 
         flash_message.should == 'Enterprise "Eaterprises" has been successfully updated!'
@@ -407,8 +418,14 @@ feature %q{
 
       # -- Update only
       select2_select "Certified Organic", from: 'enterprise_producer_properties_attributes_0_property_name'
+
       fill_in 'enterprise_producer_properties_attributes_0_value', with: "NASAA 12345"
+
+      # Because poltergist does not support form onchange event
+      # We need trigger the change manually
+      page.evaluate_script("angular.element(enterprise_form).scope().setFormDirty()")
       click_button 'Update'
+
       supplier1.producer_properties(true).count.should == 1
 
       # -- Destroy