From 138522bd171eafc5004b19613b77af169389ffb3 Mon Sep 17 00:00:00 2001 From: Luis Ramos Date: Sat, 13 Mar 2021 13:23:23 +0000 Subject: [PATCH 1/4] Add helper to view spec to make it work in rails 5 --- spec/views/spree/shared/_order_details.html.haml_spec.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/spec/views/spree/shared/_order_details.html.haml_spec.rb b/spec/views/spree/shared/_order_details.html.haml_spec.rb index d1b7986203..14ac869fa5 100644 --- a/spec/views/spree/shared/_order_details.html.haml_spec.rb +++ b/spec/views/spree/shared/_order_details.html.haml_spec.rb @@ -1,10 +1,12 @@ # frozen_string_literal: true require "spec_helper" - +require 'checkout_helper' describe "spree/shared/_order_details.html.haml" do include AuthenticationHelper helper Spree::BaseHelper + helper CheckoutHelper + helper OrderHelper let(:order) { create(:completed_order_with_fees) } @@ -12,7 +14,7 @@ describe "spree/shared/_order_details.html.haml" do assign(:order, order) allow(view).to receive_messages( order: order, - current_order: order, + current_order: order ) end From a953a12f76829102a9542cfc00b42d5c2891197e Mon Sep 17 00:00:00 2001 From: Luis Ramos Date: Sat, 13 Mar 2021 13:24:25 +0000 Subject: [PATCH 2/4] Remove dead code --- spec/spec_helper.rb | 1 - spec/support/spree/checkout_helpers.rb | 9 --------- 2 files changed, 10 deletions(-) delete mode 100644 spec/support/spree/checkout_helpers.rb diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index ab8a9802e4..0c08c0a3f4 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -185,7 +185,6 @@ RSpec.configure do |config| # Helpers config.include Rails.application.routes.url_helpers config.include Spree::UrlHelpers - config.include Spree::CheckoutHelpers config.include Spree::MoneyHelper config.include PreferencesHelper config.include ControllerRequestsHelper, type: :controller diff --git a/spec/support/spree/checkout_helpers.rb b/spec/support/spree/checkout_helpers.rb deleted file mode 100644 index 7731fe3822..0000000000 --- a/spec/support/spree/checkout_helpers.rb +++ /dev/null @@ -1,9 +0,0 @@ -# frozen_string_literal: true - -module Spree - module CheckoutHelpers - def click_checkout_continue_button - page.find('#add_new_save_checkout_button input[type=submit]').click - end - end -end From c5581fa25f500d8f52285e359c426ac965bb738d Mon Sep 17 00:00:00 2001 From: Luis Ramos Date: Sat, 13 Mar 2021 13:26:56 +0000 Subject: [PATCH 3/4] Rename spec/support/CheckoutHelper to resolve colision with app/helpers/CheckoutHelper --- spec/features/admin/order_print_ticket_spec.rb | 2 +- spec/features/consumer/shopping/checkout_auth_spec.rb | 2 +- spec/features/consumer/shopping/checkout_paypal_spec.rb | 2 +- spec/features/consumer/shopping/checkout_spec.rb | 2 +- spec/features/consumer/shopping/checkout_stripe_spec.rb | 2 +- spec/features/consumer/shopping/embedded_shopfronts_spec.rb | 2 +- spec/features/consumer/shopping/variant_overrides_spec.rb | 2 +- .../request/{checkout_helper.rb => checkout_request_helper.rb} | 2 +- spec/views/spree/shared/_order_details.html.haml_spec.rb | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) rename spec/support/request/{checkout_helper.rb => checkout_request_helper.rb} (97%) diff --git a/spec/features/admin/order_print_ticket_spec.rb b/spec/features/admin/order_print_ticket_spec.rb index 15fd46692a..e4d28d045a 100644 --- a/spec/features/admin/order_print_ticket_spec.rb +++ b/spec/features/admin/order_print_ticket_spec.rb @@ -6,7 +6,7 @@ feature ' As an administrator I want to print a ticket for an order ', js: true do - include CheckoutHelper + include CheckoutRequestsHelper include AuthenticationHelper include ActionView::Helpers::NumberHelper diff --git a/spec/features/consumer/shopping/checkout_auth_spec.rb b/spec/features/consumer/shopping/checkout_auth_spec.rb index 7bbb6e8922..2a9d178fc0 100644 --- a/spec/features/consumer/shopping/checkout_auth_spec.rb +++ b/spec/features/consumer/shopping/checkout_auth_spec.rb @@ -6,7 +6,7 @@ feature "As a consumer I want to check out my cart", js: true do include AuthenticationHelper include WebHelper include ShopWorkflow - include CheckoutHelper + include CheckoutRequestsHelper include UIComponentHelper describe "using the checkout" do diff --git a/spec/features/consumer/shopping/checkout_paypal_spec.rb b/spec/features/consumer/shopping/checkout_paypal_spec.rb index 4e8f6dce30..3135aa1d35 100644 --- a/spec/features/consumer/shopping/checkout_paypal_spec.rb +++ b/spec/features/consumer/shopping/checkout_paypal_spec.rb @@ -4,7 +4,7 @@ require "spec_helper" feature "Check out with Paypal", js: true do include ShopWorkflow - include CheckoutHelper + include CheckoutRequestsHelper include AuthenticationHelper include PaypalHelper diff --git a/spec/features/consumer/shopping/checkout_spec.rb b/spec/features/consumer/shopping/checkout_spec.rb index 20e141e262..6c07f0f0b8 100644 --- a/spec/features/consumer/shopping/checkout_spec.rb +++ b/spec/features/consumer/shopping/checkout_spec.rb @@ -5,7 +5,7 @@ require 'spec_helper' feature "As a consumer I want to check out my cart", js: true do include AuthenticationHelper include ShopWorkflow - include CheckoutHelper + include CheckoutRequestsHelper include WebHelper include UIComponentHelper diff --git a/spec/features/consumer/shopping/checkout_stripe_spec.rb b/spec/features/consumer/shopping/checkout_stripe_spec.rb index 07e1d98607..bd98d198a9 100644 --- a/spec/features/consumer/shopping/checkout_stripe_spec.rb +++ b/spec/features/consumer/shopping/checkout_stripe_spec.rb @@ -5,7 +5,7 @@ require 'spec_helper' feature "Check out with Stripe", js: true do include AuthenticationHelper include ShopWorkflow - include CheckoutHelper + include CheckoutRequestsHelper include StripeHelper include StripeStubs diff --git a/spec/features/consumer/shopping/embedded_shopfronts_spec.rb b/spec/features/consumer/shopping/embedded_shopfronts_spec.rb index 2d2d3113f1..86031e1ba5 100644 --- a/spec/features/consumer/shopping/embedded_shopfronts_spec.rb +++ b/spec/features/consumer/shopping/embedded_shopfronts_spec.rb @@ -7,7 +7,7 @@ feature "Using embedded shopfront functionality", js: true do include AuthenticationHelper include WebHelper include ShopWorkflow - include CheckoutHelper + include CheckoutRequestsHelper include UIComponentHelper describe "using iframes" do diff --git a/spec/features/consumer/shopping/variant_overrides_spec.rb b/spec/features/consumer/shopping/variant_overrides_spec.rb index ce8efc02ae..ce093f1c64 100644 --- a/spec/features/consumer/shopping/variant_overrides_spec.rb +++ b/spec/features/consumer/shopping/variant_overrides_spec.rb @@ -6,7 +6,7 @@ feature "shopping with variant overrides defined", js: true do include AuthenticationHelper include WebHelper include ShopWorkflow - include CheckoutHelper + include CheckoutRequestsHelper include UIComponentHelper let(:hub) { create(:distributor_enterprise, with_payment_and_shipping: true) } diff --git a/spec/support/request/checkout_helper.rb b/spec/support/request/checkout_request_helper.rb similarity index 97% rename from spec/support/request/checkout_helper.rb rename to spec/support/request/checkout_request_helper.rb index e27ffd27ed..3a6de815bd 100644 --- a/spec/support/request/checkout_helper.rb +++ b/spec/support/request/checkout_request_helper.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -module CheckoutHelper +module CheckoutRequestsHelper def have_checkout_details have_content "Your details" end diff --git a/spec/views/spree/shared/_order_details.html.haml_spec.rb b/spec/views/spree/shared/_order_details.html.haml_spec.rb index 14ac869fa5..5a37c4519e 100644 --- a/spec/views/spree/shared/_order_details.html.haml_spec.rb +++ b/spec/views/spree/shared/_order_details.html.haml_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require "spec_helper" -require 'checkout_helper' + describe "spree/shared/_order_details.html.haml" do include AuthenticationHelper helper Spree::BaseHelper From c224396e71e840d4005b0a2323d6a42fc5b07cb2 Mon Sep 17 00:00:00 2001 From: Luis Ramos Date: Mon, 22 Mar 2021 20:38:14 +0000 Subject: [PATCH 4/4] Correct helper name needed in this spec --- spec/features/admin/order_print_ticket_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/features/admin/order_print_ticket_spec.rb b/spec/features/admin/order_print_ticket_spec.rb index e4d28d045a..15fd46692a 100644 --- a/spec/features/admin/order_print_ticket_spec.rb +++ b/spec/features/admin/order_print_ticket_spec.rb @@ -6,7 +6,7 @@ feature ' As an administrator I want to print a ticket for an order ', js: true do - include CheckoutRequestsHelper + include CheckoutHelper include AuthenticationHelper include ActionView::Helpers::NumberHelper