Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enterprises into system #8340

Merged
merged 7 commits into from
Oct 20, 2021
Merged

Enterprises into system #8340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1ed5f2c
Moves/updates business_address_form_spec into system
filipefurtad0 Oct 12, 2021
9579783
Moves/updates images_spec into system
filipefurtad0 Oct 12, 2021
f62749e
Wraps alert text in images_spec
filipefurtad0 Oct 12, 2021
9ab3353
Moves/updates index_spec into system
filipefurtad0 Oct 12, 2021
6639ce4
Squashes terms_and_conditions_spec edits
filipefurtad0 Oct 12, 2021
33f374d
Defines strings for warning accepting with let
filipefurtad0 Oct 19, 2021
c7eed5a
Adds the system helper to business_address
filipefurtad0 Oct 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...enterprises/business_address_form_spec.rb → ...enterprises/business_address_form_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require "spec_helper"
require "system_helper"

describe "Business Address" do
include WebHelper
Expand Down
16 changes: 11 additions & 5 deletions ...features/admin/enterprises/images_spec.rb → spec/system/admin/enterprises/images_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# frozen_string_literal: true

require "spec_helper"
require "system_helper"

describe "Managing enterprise images" do
include WebHelper
Expand All @@ -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"
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion .../features/admin/enterprises/index_spec.rb → spec/system/admin/enterprises/index_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# frozen_string_literal: true

require 'spec_helper'
require 'system_helper'

describe 'Enterprises Index' do
include WebHelper
Expand Down
2 changes: 1 addition & 1 deletion .../enterprises/terms_and_conditions_spec.rb → .../enterprises/terms_and_conditions_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# frozen_string_literal: true

require "spec_helper"
require "system_helper"

describe "Uploading Terms and Conditions PDF" do
include AuthenticationHelper
Expand Down