From 25451eed6bca00bd33aed6f512f0e3ad67b38d6c Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Sat, 20 Jul 2019 00:35:36 +0100 Subject: [PATCH] Bring api spec helpers from spree_api into ofn/api_helper --- lib/spree/api/testing_support/helpers_decorator.rb | 7 ------- spec/controllers/api/customers_controller_spec.rb | 1 - spec/controllers/api/orders_controller_spec.rb | 1 - spec/controllers/api/product_images_controller_spec.rb | 1 - spec/controllers/spree/checkout_controller_spec.rb | 1 - spec/controllers/spree/users_controller_spec.rb | 1 - spec/controllers/user_passwords_controller_spec.rb | 1 - spec/controllers/user_registrations_controller_spec.rb | 1 - spec/spec_helper.rb | 5 ++--- spec/support/api_helper.rb | 9 +++++++++ 10 files changed, 11 insertions(+), 17 deletions(-) delete mode 100644 lib/spree/api/testing_support/helpers_decorator.rb diff --git a/lib/spree/api/testing_support/helpers_decorator.rb b/lib/spree/api/testing_support/helpers_decorator.rb deleted file mode 100644 index eb8e1f107d..0000000000 --- a/lib/spree/api/testing_support/helpers_decorator.rb +++ /dev/null @@ -1,7 +0,0 @@ -require 'spree/api/testing_support/helpers' - -Spree::Api::TestingSupport::Helpers.class_eval do - def current_api_user - @current_api_user ||= Spree::LegacyUser.new(email: "spree@example.com", enterprises: []) - end -end diff --git a/spec/controllers/api/customers_controller_spec.rb b/spec/controllers/api/customers_controller_spec.rb index f6c8f4e0a5..cab5b2e1e1 100644 --- a/spec/controllers/api/customers_controller_spec.rb +++ b/spec/controllers/api/customers_controller_spec.rb @@ -3,7 +3,6 @@ require 'spec_helper' module Api describe CustomersController, type: :controller do include AuthenticationWorkflow - include OpenFoodNetwork::ApiHelper render_views let(:user) { create(:user) } diff --git a/spec/controllers/api/orders_controller_spec.rb b/spec/controllers/api/orders_controller_spec.rb index 9c11b8bd0b..0819733e82 100644 --- a/spec/controllers/api/orders_controller_spec.rb +++ b/spec/controllers/api/orders_controller_spec.rb @@ -1,5 +1,4 @@ require 'spec_helper' -require 'spree/api/testing_support/helpers' module Api describe OrdersController, type: :controller do diff --git a/spec/controllers/api/product_images_controller_spec.rb b/spec/controllers/api/product_images_controller_spec.rb index e0d70c2fac..5015d41b00 100644 --- a/spec/controllers/api/product_images_controller_spec.rb +++ b/spec/controllers/api/product_images_controller_spec.rb @@ -1,5 +1,4 @@ require 'spec_helper' -require 'spree/api/testing_support/helpers' module Api describe ProductImagesController, type: :controller do diff --git a/spec/controllers/spree/checkout_controller_spec.rb b/spec/controllers/spree/checkout_controller_spec.rb index aa7229367a..00f385a810 100644 --- a/spec/controllers/spree/checkout_controller_spec.rb +++ b/spec/controllers/spree/checkout_controller_spec.rb @@ -1,5 +1,4 @@ require 'spec_helper' -require 'spree/api/testing_support/helpers' require 'support/request/authentication_workflow' describe Spree::CheckoutController, type: :controller do diff --git a/spec/controllers/spree/users_controller_spec.rb b/spec/controllers/spree/users_controller_spec.rb index 8e68b73720..50ac3ebf6f 100644 --- a/spec/controllers/spree/users_controller_spec.rb +++ b/spec/controllers/spree/users_controller_spec.rb @@ -1,5 +1,4 @@ require 'spec_helper' -require 'spree/api/testing_support/helpers' describe Spree::UsersController, type: :controller do include AuthenticationWorkflow diff --git a/spec/controllers/user_passwords_controller_spec.rb b/spec/controllers/user_passwords_controller_spec.rb index 90234ffd0d..a546fddb96 100644 --- a/spec/controllers/user_passwords_controller_spec.rb +++ b/spec/controllers/user_passwords_controller_spec.rb @@ -1,5 +1,4 @@ require 'spec_helper' -require 'spree/api/testing_support/helpers' describe UserPasswordsController, type: :controller do include OpenFoodNetwork::EmailHelper diff --git a/spec/controllers/user_registrations_controller_spec.rb b/spec/controllers/user_registrations_controller_spec.rb index a90906da51..a1c75d83e1 100644 --- a/spec/controllers/user_registrations_controller_spec.rb +++ b/spec/controllers/user_registrations_controller_spec.rb @@ -1,5 +1,4 @@ require 'spec_helper' -require 'spree/api/testing_support/helpers' describe UserRegistrationsController, type: :controller do include OpenFoodNetwork::EmailHelper diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 59354e2701..ef9ae66667 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -39,10 +39,9 @@ Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f } require 'spree/testing_support/controller_requests' require 'spree/testing_support/capybara_ext' require 'spree/api/testing_support/setup' -require 'spree/api/testing_support/helpers' -require 'spree/api/testing_support/helpers_decorator' require 'spree/testing_support/authorization_helpers' require 'spree/testing_support/preferences' +require 'support/api_helper' # Capybara config require 'selenium-webdriver' @@ -138,7 +137,7 @@ RSpec.configure do |config| config.include Spree::TestingSupport::Preferences config.include Devise::TestHelpers, type: :controller config.extend Spree::Api::TestingSupport::Setup, type: :controller - config.include Spree::Api::TestingSupport::Helpers, type: :controller + config.include OpenFoodNetwork::ApiHelper, type: :controller config.include OpenFoodNetwork::ControllerHelper, type: :controller config.include Features::DatepickerHelper, type: :feature config.include OpenFoodNetwork::FeatureToggleHelper diff --git a/spec/support/api_helper.rb b/spec/support/api_helper.rb index 08918fb761..bdd15e57d4 100644 --- a/spec/support/api_helper.rb +++ b/spec/support/api_helper.rb @@ -11,5 +11,14 @@ module OpenFoodNetwork json_response end end + + def current_api_user + @current_api_user ||= Spree::LegacyUser.new(email: "spree@example.com", enterprises: []) + end + + def assert_unauthorized! + json_response.should == { "error" => "You are not authorized to perform that action." } + response.status.should == 401 + end end end