Merge pull request #8340 from filipefurtad0/enterprises_into_system

Enterprises into system
openfoodfoundation · Oct 20, 2021 · 8852fe1 · 8852fe1
2 parents c642b98 + c7eed5a
commit 8852fe1
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/...enterprises/business_address_form_spec.rb → ...enterprises/business_address_form_spec.rb b/...enterprises/business_address_form_spec.rb → ...enterprises/business_address_form_spec.rb
@@ -1,4 +1,4 @@
-require "spec_helper"
+require "system_helper"
 
 describe "Business Address" do
   include WebHelper

diff --git a/...features/admin/enterprises/images_spec.rb → spec/system/admin/enterprises/images_spec.rb b/...features/admin/enterprises/images_spec.rb → spec/system/admin/enterprises/images_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "spec_helper"
+require "system_helper"
 
 describe "Managing enterprise images" do
   include WebHelper
@@ -18,6 +18,10 @@
     end
 
     describe "images for an enterprise" do
+
+      let(:alert_text_logo) {'The logo will be removed immediately after you confirm'.strip}
+      let(:alert_text_promo) {'The promo image will be removed immediately after you confirm.'.strip}
+
       def go_to_images
         within(".side_menu") do
           click_link "Images"
@@ -53,8 +57,9 @@ def go_to_images
 
         # Removing image
         within ".page-admin-enterprises-form__logo-field-group" do
-          click_on "Remove Image"
-          accept_js_alert
+          accept_alert(alert_text_logo) do
+            click_on "Remove Image"
+          end
         end
 
         expect(page).to have_content("Logo removed successfully")
@@ -91,8 +96,9 @@ def go_to_images
 
         # Removing image
         within ".page-admin-enterprises-form__promo-image-field-group" do
-          click_on "Remove Image"
-          accept_js_alert
+          accept_alert(alert_text_promo) do
+            click_on "Remove Image"
+          end
         end
 
         expect(page).to have_content("Promo image removed successfully")

diff --git a/.../features/admin/enterprises/index_spec.rb → spec/system/admin/enterprises/index_spec.rb b/.../features/admin/enterprises/index_spec.rb → spec/system/admin/enterprises/index_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require 'system_helper'
 
 describe 'Enterprises Index' do
   include WebHelper

diff --git a/.../enterprises/terms_and_conditions_spec.rb → .../enterprises/terms_and_conditions_spec.rb b/.../enterprises/terms_and_conditions_spec.rb → .../enterprises/terms_and_conditions_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "spec_helper"
+require "system_helper"
 
 describe "Uploading Terms and Conditions PDF" do
   include AuthenticationHelper