Merge pull request #1893 from sparc-request/sj-updating_capybara

SJ - Updating capybara

Gemfile.lock

@@ -167,13 +167,13 @@ GEM
     capistrano3-delayed-job (1.7.6)
       capistrano (~> 3.0, >= 3.0.0)
       daemons (~> 1.3)
-    capybara (3.16.1)
+    capybara (3.24.0)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
-      regexp_parser (~> 1.2)
+      regexp_parser (~> 1.5)
       xpath (~> 3.2)
     childprocess (1.0.1)
       rake (< 13.0)
@@ -439,7 +439,7 @@ GEM
       ffi (~> 1.0)
     redcarpet (3.4.0)
     ref (2.0.0)
-    regexp_parser (1.4.0)
+    regexp_parser (1.5.1)
     remotipart (1.4.2)
     request_store (1.4.1)
       rack (>= 1.4)
@@ -721,4 +721,4 @@ DEPENDENCIES
   x-editable-rails
 
 BUNDLED WITH
-   1.17.3
+   2.0.2

spec/features/catalog_manager/service_forms/pricing/user_adds_new_pricing_map_spec.rb

@@ -65,22 +65,26 @@
         wait_for_javascript_to_finish
 
         fill_in 'pricing_map_federal_rate', with: "250.00"
+        find('.modal-body').click
+        accept_confirm
         wait_for_javascript_to_finish
 
         fill_in 'pricing_map_corporate_rate', with: "350.00"
+        find('.modal-body').click
         accept_confirm
         wait_for_javascript_to_finish
 
         fill_in 'pricing_map_other_rate', with: "450.00"
+        find('.modal-body').click
         accept_confirm
         wait_for_javascript_to_finish
 
         fill_in 'pricing_map_member_rate', with: "550.00"
+        find('.modal-body').click
         accept_confirm
         wait_for_javascript_to_finish
 
         fill_in 'pricing_map_unit_type', with: "each"
-        accept_confirm
         fill_in 'pricing_map_unit_factor', with: "1.00"
         fill_in 'pricing_map_unit_minimum', with: "1"
 
@@ -115,22 +119,26 @@
         wait_for_javascript_to_finish
 
         fill_in 'pricing_map_federal_rate', with: "250.00"
+        find('.modal-body').click
+        accept_confirm
         wait_for_javascript_to_finish
 
         fill_in 'pricing_map_corporate_rate', with: "350.00"
+        find('.modal-body').click
         accept_confirm
         wait_for_javascript_to_finish
 
         fill_in 'pricing_map_other_rate', with: "450.00"
+        find('.modal-body').click
         accept_confirm
         wait_for_javascript_to_finish
 
         fill_in 'pricing_map_member_rate', with: "550.00"
+        find('.modal-body').click
         accept_confirm
         wait_for_javascript_to_finish
 
         fill_in 'pricing_map_otf_unit_type', with: "days"
-        accept_confirm
         fill_in 'pricing_map_quantity_type', with: "hours"
         fill_in 'pricing_map_quantity_minimum', with: "1"
         fill_in 'pricing_map_unit_factor', with: "1.00"