diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index c6aa3ff1ca..74b0f4f07d 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -221,155 +221,6 @@ Metrics/PerceivedComplexity: - 'app/models/spree/ability.rb' - 'app/models/spree/order/checkout.rb' -# Offense count: 144 -# This cop supports unsafe autocorrection (--autocorrect-all). -# Configuration parameters: Inferences. -RSpecRails/InferredSpecType: - Exclude: - - 'engines/dfc_provider/spec/requests/addresses_spec.rb' - - 'engines/dfc_provider/spec/requests/catalog_items_spec.rb' - - 'engines/dfc_provider/spec/requests/enterprise_groups/affiliated_by_spec.rb' - - 'engines/dfc_provider/spec/requests/enterprise_groups_spec.rb' - - 'engines/dfc_provider/spec/requests/enterprises_spec.rb' - - 'engines/dfc_provider/spec/requests/offers_spec.rb' - - 'engines/dfc_provider/spec/requests/persons_spec.rb' - - 'engines/dfc_provider/spec/requests/social_medias_spec.rb' - - 'engines/dfc_provider/spec/requests/supplied_products_spec.rb' - - 'engines/web/spec/helpers/cookies_policy_helper_spec.rb' - - 'spec/controllers/admin/bulk_line_items_controller_spec.rb' - - 'spec/controllers/admin/column_preferences_controller_spec.rb' - - 'spec/controllers/admin/customers_controller_spec.rb' - - 'spec/controllers/admin/enterprises_controller_spec.rb' - - 'spec/controllers/admin/inventory_items_controller_spec.rb' - - 'spec/controllers/admin/invoice_settings_controller_spec.rb' - - 'spec/controllers/admin/matomo_settings_controller_spec.rb' - - 'spec/controllers/admin/order_cycles_controller_spec.rb' - - 'spec/controllers/admin/product_import_controller_spec.rb' - - 'spec/controllers/admin/proxy_orders_controller_spec.rb' - - 'spec/controllers/admin/reports_controller_spec.rb' - - 'spec/controllers/admin/schedules_controller_spec.rb' - - 'spec/controllers/admin/stripe_accounts_controller_spec.rb' - - 'spec/controllers/admin/stripe_connect_settings_controller_spec.rb' - - 'spec/controllers/admin/subscription_line_items_controller_spec.rb' - - 'spec/controllers/admin/subscriptions_controller_spec.rb' - - 'spec/controllers/admin/tag_rules_controller_spec.rb' - - 'spec/controllers/admin/terms_of_service_files_controller_spec.rb' - - 'spec/controllers/admin/variant_overrides_controller_spec.rb' - - 'spec/controllers/api/v0/customers_controller_spec.rb' - - 'spec/controllers/api/v0/enterprise_fees_controller_spec.rb' - - 'spec/controllers/api/v0/enterprises_controller_spec.rb' - - 'spec/controllers/api/v0/exchange_products_controller_spec.rb' - - 'spec/controllers/api/v0/logos_controller_spec.rb' - - 'spec/controllers/api/v0/order_cycles_controller_spec.rb' - - 'spec/controllers/api/v0/orders_controller_spec.rb' - - 'spec/controllers/api/v0/product_images_controller_spec.rb' - - 'spec/controllers/api/v0/products_controller_spec.rb' - - 'spec/controllers/api/v0/promo_images_controller_spec.rb' - - 'spec/controllers/api/v0/reports/packing_report_spec.rb' - - 'spec/controllers/api/v0/reports_controller_spec.rb' - - 'spec/controllers/api/v0/shipments_controller_spec.rb' - - 'spec/controllers/api/v0/shops_controller_spec.rb' - - 'spec/controllers/api/v0/statuses_controller_spec.rb' - - 'spec/controllers/api/v0/terms_and_conditions_controller_spec.rb' - - 'spec/controllers/api/v0/variants_controller_spec.rb' - - 'spec/controllers/base_controller_spec.rb' - - 'spec/controllers/cart_controller_spec.rb' - - 'spec/controllers/checkout_controller_spec.rb' - - 'spec/controllers/enterprises_controller_spec.rb' - - 'spec/controllers/groups_controller_spec.rb' - - 'spec/controllers/line_items_controller_spec.rb' - - 'spec/controllers/payment_gateways/paypal_controller_spec.rb' - - 'spec/controllers/payment_gateways/stripe_controller_spec.rb' - - 'spec/controllers/registration_controller_spec.rb' - - 'spec/controllers/shop_controller_spec.rb' - - 'spec/controllers/shops_controller_spec.rb' - - 'spec/controllers/spree/admin/adjustments_controller_spec.rb' - - 'spec/controllers/spree/admin/base_controller_spec.rb' - - 'spec/controllers/spree/admin/countries_controller_spec.rb' - - 'spec/controllers/spree/admin/general_settings_controller_spec.rb' - - 'spec/controllers/spree/admin/orders/customer_details_controller_spec.rb' - - 'spec/controllers/spree/admin/orders/invoices_spec.rb' - - 'spec/controllers/spree/admin/orders/payments/payments_controller_refunds_spec.rb' - - 'spec/controllers/spree/admin/orders/payments/payments_controller_spec.rb' - - 'spec/controllers/spree/admin/orders_controller_spec.rb' - - 'spec/controllers/spree/admin/overview_controller_spec.rb' - - 'spec/controllers/spree/admin/payment_methods_controller_spec.rb' - - 'spec/controllers/spree/admin/products_controller_spec.rb' - - 'spec/controllers/spree/admin/return_authorizations_controller_spec.rb' - - 'spec/controllers/spree/admin/search_controller_spec.rb' - - 'spec/controllers/spree/admin/shipping_categories_controller_spec.rb' - - 'spec/controllers/spree/admin/shipping_methods_controller_spec.rb' - - 'spec/controllers/spree/admin/tax_rates_controller_spec.rb' - - 'spec/controllers/spree/admin/tax_settings_controller_spec.rb' - - 'spec/controllers/spree/admin/variants_controller_spec.rb' - - 'spec/controllers/spree/api_keys_controller_spec.rb' - - 'spec/controllers/spree/credit_cards_controller_spec.rb' - - 'spec/controllers/spree/orders_controller_spec.rb' - - 'spec/controllers/spree/user_sessions_controller_spec.rb' - - 'spec/controllers/spree/users_controller_spec.rb' - - 'spec/controllers/stripe/callbacks_controller_spec.rb' - - 'spec/controllers/stripe/webhooks_controller_spec.rb' - - 'spec/controllers/user_confirmations_controller_spec.rb' - - 'spec/controllers/user_passwords_controller_spec.rb' - - 'spec/controllers/user_registrations_controller_spec.rb' - - 'spec/controllers/webhook_endpoints_controller_spec.rb' - - 'spec/helpers/admin/enterprises_helper_spec.rb' - - 'spec/helpers/admin/orders_helper_spec.rb' - - 'spec/helpers/admin/reports_helper_spec.rb' - - 'spec/helpers/admin/subscriptions_helper_spec.rb' - - 'spec/helpers/application_helper_spec.rb' - - 'spec/helpers/checkout_helper_spec.rb' - - 'spec/helpers/i18n_helper_spec.rb' - - 'spec/helpers/injection_helper_spec.rb' - - 'spec/helpers/link_helper_spec.rb' - - 'spec/helpers/navigation_helper_spec.rb' - - 'spec/helpers/order_cycles_helper_spec.rb' - - 'spec/helpers/serializer_helper_spec.rb' - - 'spec/helpers/shop_helper_spec.rb' - - 'spec/helpers/spree/admin/base_helper_spec.rb' - - 'spec/helpers/spree/admin/general_settings_helper_spec.rb' - - 'spec/helpers/spree/admin/orders_helper_spec.rb' - - 'spec/helpers/spree/orders_helper_spec.rb' - - 'spec/helpers/tax_helper_spec.rb' - - 'spec/helpers/terms_and_conditions_helper_spec.rb' - - 'spec/jobs/connect_app_job_spec.rb' - - 'spec/mailers/producer_mailer_spec.rb' - - 'spec/mailers/subscription_mailer_spec.rb' - - 'spec/models/column_preference_spec.rb' - - 'spec/models/connected_app_spec.rb' - - 'spec/models/customer_spec.rb' - - 'spec/models/invoice_spec.rb' - - 'spec/models/oidc_account_spec.rb' - - 'spec/models/proxy_order_spec.rb' - - 'spec/models/report_blob_spec.rb' - - 'spec/models/semantic_link_spec.rb' - - 'spec/models/spree/gateway/stripe_sca_spec.rb' - - 'spec/models/subscription_spec.rb' - - 'spec/models/tag_rule/filter_order_cycles_spec.rb' - - 'spec/models/tag_rule/filter_payment_methods_spec.rb' - - 'spec/models/tag_rule/filter_products_spec.rb' - - 'spec/models/tag_rule/filter_shipping_methods_spec.rb' - - 'spec/models/tag_rule_spec.rb' - - 'spec/models/webhook_endpoint_spec.rb' - - 'spec/requests/admin/images_spec.rb' - - 'spec/requests/admin/product_import_spec.rb' - - 'spec/requests/admin/vouchers_spec.rb' - - 'spec/requests/api/orders_spec.rb' - - 'spec/requests/api/routes_spec.rb' - - 'spec/requests/api/v1/customers_spec.rb' - - 'spec/requests/api_docs_spec.rb' - - 'spec/requests/checkout/paypal_spec.rb' - - 'spec/requests/checkout/routes_spec.rb' - - 'spec/requests/checkout/stripe_sca_spec.rb' - - 'spec/requests/errors_spec.rb' - - 'spec/requests/home_controller_spec.rb' - - 'spec/requests/large_request_spec.rb' - - 'spec/requests/omniauth_callbacks_controller_spec.rb' - - 'spec/requests/spree/admin/overview_spec.rb' - - 'spec/requests/spree/admin/payments_spec.rb' - - 'spec/requests/voucher_adjustments_spec.rb' - - 'spec/routing/stripe_spec.rb' - # Offense count: 1 # Configuration parameters: TransactionMethods. Rails/TransactionExitStatement: diff --git a/engines/dfc_provider/spec/requests/addresses_spec.rb b/engines/dfc_provider/spec/requests/addresses_spec.rb index 7c06914078..56eb1f4eed 100644 --- a/engines/dfc_provider/spec/requests/addresses_spec.rb +++ b/engines/dfc_provider/spec/requests/addresses_spec.rb @@ -2,7 +2,7 @@ require_relative "../swagger_helper" -RSpec.describe "Addresses", type: :request, swagger_doc: "dfc.yaml" do +RSpec.describe "Addresses", swagger_doc: "dfc.yaml" do let(:user) { create(:oidc_user) } let(:address) { create(:address, id: 40_000) } let(:result) { json_response } diff --git a/engines/dfc_provider/spec/requests/catalog_items_spec.rb b/engines/dfc_provider/spec/requests/catalog_items_spec.rb index a48f6c0eba..ac8b091c9a 100644 --- a/engines/dfc_provider/spec/requests/catalog_items_spec.rb +++ b/engines/dfc_provider/spec/requests/catalog_items_spec.rb @@ -2,7 +2,7 @@ require_relative "../swagger_helper" -RSpec.describe "CatalogItems", type: :request, swagger_doc: "dfc.yaml" do +RSpec.describe "CatalogItems", swagger_doc: "dfc.yaml" do let(:user) { create(:oidc_user, id: 12_345) } let(:enterprise) { create( diff --git a/engines/dfc_provider/spec/requests/enterprise_groups/affiliated_by_spec.rb b/engines/dfc_provider/spec/requests/enterprise_groups/affiliated_by_spec.rb index e6ef549213..0b82bb647f 100644 --- a/engines/dfc_provider/spec/requests/enterprise_groups/affiliated_by_spec.rb +++ b/engines/dfc_provider/spec/requests/enterprise_groups/affiliated_by_spec.rb @@ -2,7 +2,7 @@ require_relative "../../swagger_helper" -RSpec.describe "EnterpriseGroups::AffiliatedBy", type: :request, swagger_doc: "dfc.yaml" do +RSpec.describe "EnterpriseGroups::AffiliatedBy", swagger_doc: "dfc.yaml" do let(:user) { create(:oidc_user, id: 12_345) } let(:group) { create( diff --git a/engines/dfc_provider/spec/requests/enterprise_groups_spec.rb b/engines/dfc_provider/spec/requests/enterprise_groups_spec.rb index 4836a689f5..44385d3878 100644 --- a/engines/dfc_provider/spec/requests/enterprise_groups_spec.rb +++ b/engines/dfc_provider/spec/requests/enterprise_groups_spec.rb @@ -2,7 +2,7 @@ require_relative "../swagger_helper" -RSpec.describe "EnterpriseGroups", type: :request, swagger_doc: "dfc.yaml" do +RSpec.describe "EnterpriseGroups", swagger_doc: "dfc.yaml" do let(:user) { create(:oidc_user, id: 12_345) } let(:group) { create( diff --git a/engines/dfc_provider/spec/requests/enterprises_spec.rb b/engines/dfc_provider/spec/requests/enterprises_spec.rb index 254d04fc11..331626e46e 100644 --- a/engines/dfc_provider/spec/requests/enterprises_spec.rb +++ b/engines/dfc_provider/spec/requests/enterprises_spec.rb @@ -2,7 +2,7 @@ require_relative "../swagger_helper" -RSpec.describe "Enterprises", type: :request, swagger_doc: "dfc.yaml" do +RSpec.describe "Enterprises", swagger_doc: "dfc.yaml" do let!(:user) { create(:oidc_user) } let!(:enterprise) do create( diff --git a/engines/dfc_provider/spec/requests/offers_spec.rb b/engines/dfc_provider/spec/requests/offers_spec.rb index 8e3ffe8dab..9f223b41f3 100644 --- a/engines/dfc_provider/spec/requests/offers_spec.rb +++ b/engines/dfc_provider/spec/requests/offers_spec.rb @@ -2,7 +2,7 @@ require_relative "../swagger_helper" -RSpec.describe "Offers", type: :request, swagger_doc: "dfc.yaml" do +RSpec.describe "Offers", swagger_doc: "dfc.yaml" do let!(:user) { create(:oidc_user) } let!(:enterprise) { create(:distributor_enterprise, id: 10_000, owner: user) } let!(:product) { diff --git a/engines/dfc_provider/spec/requests/persons_spec.rb b/engines/dfc_provider/spec/requests/persons_spec.rb index c6379affd7..31a35f47af 100644 --- a/engines/dfc_provider/spec/requests/persons_spec.rb +++ b/engines/dfc_provider/spec/requests/persons_spec.rb @@ -2,7 +2,7 @@ require_relative "../swagger_helper" -RSpec.describe "Persons", type: :request, swagger_doc: "dfc.yaml" do +RSpec.describe "Persons", swagger_doc: "dfc.yaml" do let(:user) { create(:oidc_user, id: 10_000) } let(:other_user) { create(:oidc_user) } diff --git a/engines/dfc_provider/spec/requests/social_medias_spec.rb b/engines/dfc_provider/spec/requests/social_medias_spec.rb index 32c479f593..adfd902c39 100644 --- a/engines/dfc_provider/spec/requests/social_medias_spec.rb +++ b/engines/dfc_provider/spec/requests/social_medias_spec.rb @@ -2,7 +2,7 @@ require_relative "../swagger_helper" -RSpec.describe "SocialMedias", type: :request, swagger_doc: "dfc.yaml" do +RSpec.describe "SocialMedias", swagger_doc: "dfc.yaml" do let(:user) { create(:oidc_user) } let(:enterprise) do create( diff --git a/engines/dfc_provider/spec/requests/supplied_products_spec.rb b/engines/dfc_provider/spec/requests/supplied_products_spec.rb index a5f7d857ab..a316154159 100644 --- a/engines/dfc_provider/spec/requests/supplied_products_spec.rb +++ b/engines/dfc_provider/spec/requests/supplied_products_spec.rb @@ -2,7 +2,7 @@ require_relative "../swagger_helper" -RSpec.describe "SuppliedProducts", type: :request, swagger_doc: "dfc.yaml" do +RSpec.describe "SuppliedProducts", swagger_doc: "dfc.yaml" do let!(:user) { create(:oidc_user) } let!(:enterprise) { create(:distributor_enterprise, id: 10_000, owner: user) } let!(:product) { diff --git a/engines/web/spec/helpers/cookies_policy_helper_spec.rb b/engines/web/spec/helpers/cookies_policy_helper_spec.rb index 81a779c7dd..81607dbc1b 100644 --- a/engines/web/spec/helpers/cookies_policy_helper_spec.rb +++ b/engines/web/spec/helpers/cookies_policy_helper_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' module Web - RSpec.describe CookiesPolicyHelper, type: :helper do + RSpec.describe CookiesPolicyHelper do # keeps global state unchanged around do |example| original_locale = I18n.locale diff --git a/spec/controllers/admin/bulk_line_items_controller_spec.rb b/spec/controllers/admin/bulk_line_items_controller_spec.rb index a69798da31..840df6e506 100644 --- a/spec/controllers/admin/bulk_line_items_controller_spec.rb +++ b/spec/controllers/admin/bulk_line_items_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Admin::BulkLineItemsController, type: :controller do +RSpec.describe Admin::BulkLineItemsController do describe '#index' do render_views diff --git a/spec/controllers/admin/column_preferences_controller_spec.rb b/spec/controllers/admin/column_preferences_controller_spec.rb index c29153534d..d8d5bcc389 100644 --- a/spec/controllers/admin/column_preferences_controller_spec.rb +++ b/spec/controllers/admin/column_preferences_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Admin::ColumnPreferencesController, type: :controller do +RSpec.describe Admin::ColumnPreferencesController do include AuthenticationHelper describe "bulk_update" do diff --git a/spec/controllers/admin/customers_controller_spec.rb b/spec/controllers/admin/customers_controller_spec.rb index 4a153c1410..9d3265af9a 100644 --- a/spec/controllers/admin/customers_controller_spec.rb +++ b/spec/controllers/admin/customers_controller_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' module Admin - RSpec.describe CustomersController, type: :controller do + RSpec.describe CustomersController do include AuthenticationHelper describe "index" do diff --git a/spec/controllers/admin/enterprises_controller_spec.rb b/spec/controllers/admin/enterprises_controller_spec.rb index 415f75cc2a..3806969b49 100644 --- a/spec/controllers/admin/enterprises_controller_spec.rb +++ b/spec/controllers/admin/enterprises_controller_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' require 'open_food_network/order_cycle_permissions' -RSpec.describe Admin::EnterprisesController, type: :controller do +RSpec.describe Admin::EnterprisesController do let(:user) { create(:user) } let(:admin_user) { create(:admin_user) } let(:distributor_manager) { create(:user, enterprise_limit: 10, enterprises: [distributor]) } diff --git a/spec/controllers/admin/inventory_items_controller_spec.rb b/spec/controllers/admin/inventory_items_controller_spec.rb index 58650e4aa5..7c5395dc16 100644 --- a/spec/controllers/admin/inventory_items_controller_spec.rb +++ b/spec/controllers/admin/inventory_items_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Admin::InventoryItemsController, type: :controller do +RSpec.describe Admin::InventoryItemsController do describe "create" do context "json" do let(:format) { :json } diff --git a/spec/controllers/admin/invoice_settings_controller_spec.rb b/spec/controllers/admin/invoice_settings_controller_spec.rb index de8edc2a62..8ee561adb5 100644 --- a/spec/controllers/admin/invoice_settings_controller_spec.rb +++ b/spec/controllers/admin/invoice_settings_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Admin::InvoiceSettingsController, type: :controller do +RSpec.describe Admin::InvoiceSettingsController do describe "#update" do let(:params) { { diff --git a/spec/controllers/admin/matomo_settings_controller_spec.rb b/spec/controllers/admin/matomo_settings_controller_spec.rb index f488bd9637..d3b5924e90 100644 --- a/spec/controllers/admin/matomo_settings_controller_spec.rb +++ b/spec/controllers/admin/matomo_settings_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Admin::MatomoSettingsController, type: :controller do +RSpec.describe Admin::MatomoSettingsController do describe "#update" do let(:params) { { diff --git a/spec/controllers/admin/order_cycles_controller_spec.rb b/spec/controllers/admin/order_cycles_controller_spec.rb index 59f848f53e..bd0c911011 100644 --- a/spec/controllers/admin/order_cycles_controller_spec.rb +++ b/spec/controllers/admin/order_cycles_controller_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' module Admin - RSpec.describe OrderCyclesController, type: :controller do + RSpec.describe OrderCyclesController do let!(:distributor_owner) { create(:user) } let(:datetime_confirmation_attrs) { { confirm_datetime_change: nil, diff --git a/spec/controllers/admin/product_import_controller_spec.rb b/spec/controllers/admin/product_import_controller_spec.rb index ac6cf560f1..6e3a63b43b 100644 --- a/spec/controllers/admin/product_import_controller_spec.rb +++ b/spec/controllers/admin/product_import_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Admin::ProductImportController, type: :controller do +RSpec.describe Admin::ProductImportController do describe 'validate_file_path' do let(:tmp_directory_base) { Rails.root.join("tmp/product_import-") } diff --git a/spec/controllers/admin/proxy_orders_controller_spec.rb b/spec/controllers/admin/proxy_orders_controller_spec.rb index 78cb77d343..ddd4158266 100644 --- a/spec/controllers/admin/proxy_orders_controller_spec.rb +++ b/spec/controllers/admin/proxy_orders_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Admin::ProxyOrdersController, type: :controller do +RSpec.describe Admin::ProxyOrdersController do include AuthenticationHelper describe 'cancel' do diff --git a/spec/controllers/admin/reports_controller_spec.rb b/spec/controllers/admin/reports_controller_spec.rb index 81eeccbf77..d0b6104d8c 100644 --- a/spec/controllers/admin/reports_controller_spec.rb +++ b/spec/controllers/admin/reports_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Admin::ReportsController, type: :controller do +RSpec.describe Admin::ReportsController do # Given two distributors and two suppliers let(:bill_address) { create(:address) } let(:ship_address) { create(:address) } diff --git a/spec/controllers/admin/schedules_controller_spec.rb b/spec/controllers/admin/schedules_controller_spec.rb index 01d85ab693..ee15ea1a61 100644 --- a/spec/controllers/admin/schedules_controller_spec.rb +++ b/spec/controllers/admin/schedules_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Admin::SchedulesController, type: :controller do +RSpec.describe Admin::SchedulesController do include AuthenticationHelper describe "index" do diff --git a/spec/controllers/admin/stripe_accounts_controller_spec.rb b/spec/controllers/admin/stripe_accounts_controller_spec.rb index 93774422fa..19a199b12d 100644 --- a/spec/controllers/admin/stripe_accounts_controller_spec.rb +++ b/spec/controllers/admin/stripe_accounts_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Admin::StripeAccountsController, type: :controller do +RSpec.describe Admin::StripeAccountsController do let(:enterprise) { create(:distributor_enterprise) } describe "#connect" do diff --git a/spec/controllers/admin/stripe_connect_settings_controller_spec.rb b/spec/controllers/admin/stripe_connect_settings_controller_spec.rb index ac56335e2d..fa6d800916 100644 --- a/spec/controllers/admin/stripe_connect_settings_controller_spec.rb +++ b/spec/controllers/admin/stripe_connect_settings_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Admin::StripeConnectSettingsController, type: :controller do +RSpec.describe Admin::StripeConnectSettingsController do let(:user) { create(:user) } let(:admin) { create(:admin_user) } diff --git a/spec/controllers/admin/subscription_line_items_controller_spec.rb b/spec/controllers/admin/subscription_line_items_controller_spec.rb index 5926abf23d..03955d13a3 100644 --- a/spec/controllers/admin/subscription_line_items_controller_spec.rb +++ b/spec/controllers/admin/subscription_line_items_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Admin::SubscriptionLineItemsController, type: :controller do +RSpec.describe Admin::SubscriptionLineItemsController do include AuthenticationHelper describe "build" do diff --git a/spec/controllers/admin/subscriptions_controller_spec.rb b/spec/controllers/admin/subscriptions_controller_spec.rb index a929c9509c..ceb18d03df 100644 --- a/spec/controllers/admin/subscriptions_controller_spec.rb +++ b/spec/controllers/admin/subscriptions_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Admin::SubscriptionsController, type: :controller do +RSpec.describe Admin::SubscriptionsController do include AuthenticationHelper describe 'index' do diff --git a/spec/controllers/admin/tag_rules_controller_spec.rb b/spec/controllers/admin/tag_rules_controller_spec.rb index 66930b43ce..5e9cb14ab2 100644 --- a/spec/controllers/admin/tag_rules_controller_spec.rb +++ b/spec/controllers/admin/tag_rules_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Admin::TagRulesController, type: :controller do +RSpec.describe Admin::TagRulesController do describe "destroy" do context "json" do let(:format) { :json } diff --git a/spec/controllers/admin/terms_of_service_files_controller_spec.rb b/spec/controllers/admin/terms_of_service_files_controller_spec.rb index dac296ea95..0a2e4e8099 100644 --- a/spec/controllers/admin/terms_of_service_files_controller_spec.rb +++ b/spec/controllers/admin/terms_of_service_files_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Admin::TermsOfServiceFilesController, type: :controller do +RSpec.describe Admin::TermsOfServiceFilesController do context "a non-admin user" do let(:user) { create(:user) } diff --git a/spec/controllers/admin/variant_overrides_controller_spec.rb b/spec/controllers/admin/variant_overrides_controller_spec.rb index 97e917da19..096e5a40e7 100644 --- a/spec/controllers/admin/variant_overrides_controller_spec.rb +++ b/spec/controllers/admin/variant_overrides_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Admin::VariantOverridesController, type: :controller do +RSpec.describe Admin::VariantOverridesController do describe "index" do context "not logged in" do it "redirects to login" do diff --git a/spec/controllers/api/v0/customers_controller_spec.rb b/spec/controllers/api/v0/customers_controller_spec.rb index f77fd470fe..57389a238a 100644 --- a/spec/controllers/api/v0/customers_controller_spec.rb +++ b/spec/controllers/api/v0/customers_controller_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' module Api - RSpec.describe V0::CustomersController, type: :controller do + RSpec.describe V0::CustomersController do include AuthenticationHelper render_views diff --git a/spec/controllers/api/v0/enterprise_fees_controller_spec.rb b/spec/controllers/api/v0/enterprise_fees_controller_spec.rb index 06a7b564fe..bca69dd91f 100644 --- a/spec/controllers/api/v0/enterprise_fees_controller_spec.rb +++ b/spec/controllers/api/v0/enterprise_fees_controller_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' module Api - RSpec.describe V0::EnterpriseFeesController, type: :controller do + RSpec.describe V0::EnterpriseFeesController do include AuthenticationHelper let!(:unreferenced_fee) { create(:enterprise_fee) } diff --git a/spec/controllers/api/v0/enterprises_controller_spec.rb b/spec/controllers/api/v0/enterprises_controller_spec.rb index 5224c5f2e5..397f7e1953 100644 --- a/spec/controllers/api/v0/enterprises_controller_spec.rb +++ b/spec/controllers/api/v0/enterprises_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Api::V0::EnterprisesController, type: :controller do +RSpec.describe Api::V0::EnterprisesController do render_views let(:enterprise) { create(:distributor_enterprise) } diff --git a/spec/controllers/api/v0/exchange_products_controller_spec.rb b/spec/controllers/api/v0/exchange_products_controller_spec.rb index f290186450..03f6176e25 100644 --- a/spec/controllers/api/v0/exchange_products_controller_spec.rb +++ b/spec/controllers/api/v0/exchange_products_controller_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' module Api - RSpec.describe V0::ExchangeProductsController, type: :controller do + RSpec.describe V0::ExchangeProductsController do include AuthenticationHelper let(:order_cycle) { create(:order_cycle) } diff --git a/spec/controllers/api/v0/logos_controller_spec.rb b/spec/controllers/api/v0/logos_controller_spec.rb index ac99bc272f..80148f1490 100644 --- a/spec/controllers/api/v0/logos_controller_spec.rb +++ b/spec/controllers/api/v0/logos_controller_spec.rb @@ -3,7 +3,7 @@ require "spec_helper" module Api - RSpec.describe V0::LogosController, type: :controller do + RSpec.describe V0::LogosController do include AuthenticationHelper include FileHelper diff --git a/spec/controllers/api/v0/order_cycles_controller_spec.rb b/spec/controllers/api/v0/order_cycles_controller_spec.rb index 55d667b1e0..b42c8d28e8 100644 --- a/spec/controllers/api/v0/order_cycles_controller_spec.rb +++ b/spec/controllers/api/v0/order_cycles_controller_spec.rb @@ -3,7 +3,7 @@ require "spec_helper" module Api - RSpec.describe V0::OrderCyclesController, type: :controller do + RSpec.describe V0::OrderCyclesController do let!(:distributor) { create(:distributor_enterprise) } let!(:order_cycle) { create(:simple_order_cycle, distributors: [distributor]) } let!(:exchange) { order_cycle.exchanges.to_enterprises(distributor).outgoing.first } diff --git a/spec/controllers/api/v0/orders_controller_spec.rb b/spec/controllers/api/v0/orders_controller_spec.rb index 46af729b6d..e0245dceff 100644 --- a/spec/controllers/api/v0/orders_controller_spec.rb +++ b/spec/controllers/api/v0/orders_controller_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' module Api - RSpec.describe V0::OrdersController, type: :controller do + RSpec.describe V0::OrdersController do include AuthenticationHelper render_views diff --git a/spec/controllers/api/v0/product_images_controller_spec.rb b/spec/controllers/api/v0/product_images_controller_spec.rb index 60e90b997f..3b1cb45673 100644 --- a/spec/controllers/api/v0/product_images_controller_spec.rb +++ b/spec/controllers/api/v0/product_images_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Api::V0::ProductImagesController, type: :controller do +RSpec.describe Api::V0::ProductImagesController do include AuthenticationHelper include FileHelper render_views diff --git a/spec/controllers/api/v0/products_controller_spec.rb b/spec/controllers/api/v0/products_controller_spec.rb index 3fcaa49a07..8150cf9332 100644 --- a/spec/controllers/api/v0/products_controller_spec.rb +++ b/spec/controllers/api/v0/products_controller_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' require 'spree/core/product_duplicator' -RSpec.describe Api::V0::ProductsController, type: :controller do +RSpec.describe Api::V0::ProductsController do render_views let(:supplier) { create(:supplier_enterprise) } diff --git a/spec/controllers/api/v0/promo_images_controller_spec.rb b/spec/controllers/api/v0/promo_images_controller_spec.rb index df12d3a70f..05e517ff93 100644 --- a/spec/controllers/api/v0/promo_images_controller_spec.rb +++ b/spec/controllers/api/v0/promo_images_controller_spec.rb @@ -3,7 +3,7 @@ require "spec_helper" module Api - RSpec.describe V0::PromoImagesController, type: :controller do + RSpec.describe V0::PromoImagesController do include AuthenticationHelper include FileHelper diff --git a/spec/controllers/api/v0/reports/packing_report_spec.rb b/spec/controllers/api/v0/reports/packing_report_spec.rb index 055ddc737d..dc69ddc647 100644 --- a/spec/controllers/api/v0/reports/packing_report_spec.rb +++ b/spec/controllers/api/v0/reports/packing_report_spec.rb @@ -2,7 +2,7 @@ require "spec_helper" -RSpec.describe Api::V0::ReportsController, type: :controller do +RSpec.describe Api::V0::ReportsController do let(:params) { { report_type: 'packing', diff --git a/spec/controllers/api/v0/reports_controller_spec.rb b/spec/controllers/api/v0/reports_controller_spec.rb index 7f7dd358fe..612db3036a 100644 --- a/spec/controllers/api/v0/reports_controller_spec.rb +++ b/spec/controllers/api/v0/reports_controller_spec.rb @@ -2,7 +2,7 @@ require "spec_helper" -RSpec.describe Api::V0::ReportsController, type: :controller do +RSpec.describe Api::V0::ReportsController do let(:enterprise_user) { create(:user, enterprises: [create(:enterprise)]) } let(:params) { { diff --git a/spec/controllers/api/v0/shipments_controller_spec.rb b/spec/controllers/api/v0/shipments_controller_spec.rb index 4298373ab4..e79c9dcec9 100644 --- a/spec/controllers/api/v0/shipments_controller_spec.rb +++ b/spec/controllers/api/v0/shipments_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Api::V0::ShipmentsController, type: :controller do +RSpec.describe Api::V0::ShipmentsController do render_views let!(:shipment) { create(:shipment) } diff --git a/spec/controllers/api/v0/shops_controller_spec.rb b/spec/controllers/api/v0/shops_controller_spec.rb index b3acf2d710..a494ebb254 100644 --- a/spec/controllers/api/v0/shops_controller_spec.rb +++ b/spec/controllers/api/v0/shops_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Api::V0::ShopsController, type: :controller do +RSpec.describe Api::V0::ShopsController do include AuthenticationHelper render_views diff --git a/spec/controllers/api/v0/statuses_controller_spec.rb b/spec/controllers/api/v0/statuses_controller_spec.rb index 3fd9973b3a..d27a7aa69a 100644 --- a/spec/controllers/api/v0/statuses_controller_spec.rb +++ b/spec/controllers/api/v0/statuses_controller_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' module Api - RSpec.describe V0::StatusesController, type: :controller do + RSpec.describe V0::StatusesController do render_views describe "job queue status" do diff --git a/spec/controllers/api/v0/terms_and_conditions_controller_spec.rb b/spec/controllers/api/v0/terms_and_conditions_controller_spec.rb index e6e6bdefc2..7a24529c39 100644 --- a/spec/controllers/api/v0/terms_and_conditions_controller_spec.rb +++ b/spec/controllers/api/v0/terms_and_conditions_controller_spec.rb @@ -3,7 +3,7 @@ require "spec_helper" module Api - RSpec.describe V0::TermsAndConditionsController, type: :controller do + RSpec.describe V0::TermsAndConditionsController do include AuthenticationHelper include FileHelper diff --git a/spec/controllers/api/v0/variants_controller_spec.rb b/spec/controllers/api/v0/variants_controller_spec.rb index 744ddedbd2..df3456eecb 100644 --- a/spec/controllers/api/v0/variants_controller_spec.rb +++ b/spec/controllers/api/v0/variants_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Api::V0::VariantsController, type: :controller do +RSpec.describe Api::V0::VariantsController do render_views let(:supplier) { create(:supplier_enterprise) } diff --git a/spec/controllers/base_controller_spec.rb b/spec/controllers/base_controller_spec.rb index 0c9ff572ad..e5f07ec8b6 100644 --- a/spec/controllers/base_controller_spec.rb +++ b/spec/controllers/base_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe BaseController, type: :controller do +RSpec.describe BaseController do let(:oc) { instance_double(OrderCycle, id: 1) } let(:order) { instance_double(Spree::Order) } controller(BaseController) do diff --git a/spec/controllers/cart_controller_spec.rb b/spec/controllers/cart_controller_spec.rb index 3d8322dfcb..b08cca2b12 100644 --- a/spec/controllers/cart_controller_spec.rb +++ b/spec/controllers/cart_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe CartController, type: :controller do +RSpec.describe CartController do let(:order) { create(:order) } describe "basic behaviour" do diff --git a/spec/controllers/checkout_controller_spec.rb b/spec/controllers/checkout_controller_spec.rb index 88a900da9b..165264f47e 100644 --- a/spec/controllers/checkout_controller_spec.rb +++ b/spec/controllers/checkout_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe CheckoutController, type: :controller do +RSpec.describe CheckoutController do let(:user) { order.user } let(:address) { create(:address) } let(:distributor) { create(:distributor_enterprise, with_payment_and_shipping: true) } diff --git a/spec/controllers/enterprises_controller_spec.rb b/spec/controllers/enterprises_controller_spec.rb index 149b7ae881..c209307cfb 100644 --- a/spec/controllers/enterprises_controller_spec.rb +++ b/spec/controllers/enterprises_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe EnterprisesController, type: :controller do +RSpec.describe EnterprisesController do describe "shopping for a distributor" do let(:user) { create(:user) } let(:order) { controller.current_order(true) } diff --git a/spec/controllers/groups_controller_spec.rb b/spec/controllers/groups_controller_spec.rb index a7d91c3522..1ad96df7e8 100644 --- a/spec/controllers/groups_controller_spec.rb +++ b/spec/controllers/groups_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe GroupsController, type: :controller do +RSpec.describe GroupsController do render_views let!(:enterprise) { create(:distributor_enterprise) } diff --git a/spec/controllers/line_items_controller_spec.rb b/spec/controllers/line_items_controller_spec.rb index 7b4fb970de..42ab3ba13a 100644 --- a/spec/controllers/line_items_controller_spec.rb +++ b/spec/controllers/line_items_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe LineItemsController, type: :controller do +RSpec.describe LineItemsController do let(:user) { create(:user) } let(:distributor) { create(:distributor_enterprise) } let(:order_cycle) { create(:simple_order_cycle) } diff --git a/spec/controllers/payment_gateways/paypal_controller_spec.rb b/spec/controllers/payment_gateways/paypal_controller_spec.rb index 7bde1845cb..2dc54342bd 100644 --- a/spec/controllers/payment_gateways/paypal_controller_spec.rb +++ b/spec/controllers/payment_gateways/paypal_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe PaymentGateways::PaypalController, type: :controller do +RSpec.describe PaymentGateways::PaypalController do context '#cancel' do it 'redirects back to checkout' do expect(get(:cancel)).to redirect_to checkout_path diff --git a/spec/controllers/payment_gateways/stripe_controller_spec.rb b/spec/controllers/payment_gateways/stripe_controller_spec.rb index 28c2c0b595..1475503759 100644 --- a/spec/controllers/payment_gateways/stripe_controller_spec.rb +++ b/spec/controllers/payment_gateways/stripe_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe PaymentGateways::StripeController, type: :controller do +RSpec.describe PaymentGateways::StripeController do include StripeStubs let!(:distributor) { create(:distributor_enterprise, with_payment_and_shipping: true) } diff --git a/spec/controllers/registration_controller_spec.rb b/spec/controllers/registration_controller_spec.rb index bb87674ba9..c89c43eb8f 100644 --- a/spec/controllers/registration_controller_spec.rb +++ b/spec/controllers/registration_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe RegistrationController, type: :controller do +RSpec.describe RegistrationController do describe "redirecting when user not logged in" do it "index" do get :index diff --git a/spec/controllers/shop_controller_spec.rb b/spec/controllers/shop_controller_spec.rb index 0986630c68..437a737ee0 100644 --- a/spec/controllers/shop_controller_spec.rb +++ b/spec/controllers/shop_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe ShopController, type: :controller do +RSpec.describe ShopController do let!(:pm) { create(:payment_method) } let!(:sm) { create(:shipping_method) } let(:distributor) { diff --git a/spec/controllers/shops_controller_spec.rb b/spec/controllers/shops_controller_spec.rb index 84d639eb13..914da71979 100644 --- a/spec/controllers/shops_controller_spec.rb +++ b/spec/controllers/shops_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe ShopsController, type: :controller do +RSpec.describe ShopsController do include WebHelper render_views diff --git a/spec/controllers/spree/admin/adjustments_controller_spec.rb b/spec/controllers/spree/admin/adjustments_controller_spec.rb index 93837dbfb8..abccf7d87a 100644 --- a/spec/controllers/spree/admin/adjustments_controller_spec.rb +++ b/spec/controllers/spree/admin/adjustments_controller_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' module Spree - RSpec.describe Admin::AdjustmentsController, type: :controller do + RSpec.describe Admin::AdjustmentsController do include AuthenticationHelper before { controller_login_as_admin } diff --git a/spec/controllers/spree/admin/base_controller_spec.rb b/spec/controllers/spree/admin/base_controller_spec.rb index 7879b62d0b..2361da8565 100644 --- a/spec/controllers/spree/admin/base_controller_spec.rb +++ b/spec/controllers/spree/admin/base_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Spree::Admin::BaseController, type: :controller do +RSpec.describe Spree::Admin::BaseController do controller(Spree::Admin::BaseController) do def index before_action :unauthorized diff --git a/spec/controllers/spree/admin/countries_controller_spec.rb b/spec/controllers/spree/admin/countries_controller_spec.rb index d5829a9149..7367e8d278 100644 --- a/spec/controllers/spree/admin/countries_controller_spec.rb +++ b/spec/controllers/spree/admin/countries_controller_spec.rb @@ -4,7 +4,7 @@ require 'spec_helper' module Spree module Admin - RSpec.describe CountriesController, type: :controller do + RSpec.describe CountriesController do include AuthenticationHelper describe "#update" do diff --git a/spec/controllers/spree/admin/general_settings_controller_spec.rb b/spec/controllers/spree/admin/general_settings_controller_spec.rb index 1a0e0b002f..a0b592a0a8 100644 --- a/spec/controllers/spree/admin/general_settings_controller_spec.rb +++ b/spec/controllers/spree/admin/general_settings_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Spree::Admin::GeneralSettingsController, type: :controller do +RSpec.describe Spree::Admin::GeneralSettingsController do include AuthenticationHelper describe 'updating general settings' do diff --git a/spec/controllers/spree/admin/orders/customer_details_controller_spec.rb b/spec/controllers/spree/admin/orders/customer_details_controller_spec.rb index 44b595b8ab..e26a66c081 100644 --- a/spec/controllers/spree/admin/orders/customer_details_controller_spec.rb +++ b/spec/controllers/spree/admin/orders/customer_details_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Spree::Admin::Orders::CustomerDetailsController, type: :controller do +RSpec.describe Spree::Admin::Orders::CustomerDetailsController do include AuthenticationHelper describe "#update" do diff --git a/spec/controllers/spree/admin/orders/invoices_spec.rb b/spec/controllers/spree/admin/orders/invoices_spec.rb index 3eda9051a2..1906e3a309 100644 --- a/spec/controllers/spree/admin/orders/invoices_spec.rb +++ b/spec/controllers/spree/admin/orders/invoices_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Spree::Admin::OrdersController, type: :controller do +RSpec.describe Spree::Admin::OrdersController do describe "#invoice" do let!(:user) { create(:user) } let!(:enterprise_user) { create(:user) } @@ -106,7 +106,7 @@ RSpec.describe Spree::Admin::OrdersController, type: :controller do end end -RSpec.describe Spree::Admin::InvoicesController, type: :controller do +RSpec.describe Spree::Admin::InvoicesController do describe "#index" do let(:user) { create(:user) } let(:enterprise_user) { create(:user, enterprises: [create(:enterprise)]) } diff --git a/spec/controllers/spree/admin/orders/payments/payments_controller_refunds_spec.rb b/spec/controllers/spree/admin/orders/payments/payments_controller_refunds_spec.rb index 1e3b1cf8c6..2ab5e6a94c 100644 --- a/spec/controllers/spree/admin/orders/payments/payments_controller_refunds_spec.rb +++ b/spec/controllers/spree/admin/orders/payments/payments_controller_refunds_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Spree::Admin::PaymentsController, type: :controller do +RSpec.describe Spree::Admin::PaymentsController do include StripeHelper include StripeStubs diff --git a/spec/controllers/spree/admin/orders/payments/payments_controller_spec.rb b/spec/controllers/spree/admin/orders/payments/payments_controller_spec.rb index 4fc24e2a1c..6214e06af5 100644 --- a/spec/controllers/spree/admin/orders/payments/payments_controller_spec.rb +++ b/spec/controllers/spree/admin/orders/payments/payments_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Spree::Admin::PaymentsController, type: :controller do +RSpec.describe Spree::Admin::PaymentsController do let!(:shop) { create(:enterprise) } let!(:user) { shop.owner } let!(:order) { create(:order, distributor: shop, state: 'complete') } diff --git a/spec/controllers/spree/admin/orders_controller_spec.rb b/spec/controllers/spree/admin/orders_controller_spec.rb index ea660bb479..34af692760 100644 --- a/spec/controllers/spree/admin/orders_controller_spec.rb +++ b/spec/controllers/spree/admin/orders_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Spree::Admin::OrdersController, type: :controller do +RSpec.describe Spree::Admin::OrdersController do describe "#edit" do let!(:order) { create(:order_with_totals_and_distribution, ship_address: create(:address)) } diff --git a/spec/controllers/spree/admin/overview_controller_spec.rb b/spec/controllers/spree/admin/overview_controller_spec.rb index cb5f218f24..df4429c109 100644 --- a/spec/controllers/spree/admin/overview_controller_spec.rb +++ b/spec/controllers/spree/admin/overview_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Spree::Admin::OverviewController, type: :controller do +RSpec.describe Spree::Admin::OverviewController do describe "#index" do before do allow(controller).to receive(:spree_current_user).and_return(user) diff --git a/spec/controllers/spree/admin/payment_methods_controller_spec.rb b/spec/controllers/spree/admin/payment_methods_controller_spec.rb index 7124e9fecd..6e14f8d3cd 100644 --- a/spec/controllers/spree/admin/payment_methods_controller_spec.rb +++ b/spec/controllers/spree/admin/payment_methods_controller_spec.rb @@ -7,7 +7,7 @@ module Spree preference :password, :string, default: "password" end - RSpec.describe Admin::PaymentMethodsController, type: :controller do + RSpec.describe Admin::PaymentMethodsController do let(:user) { create(:user, enterprises: [create(:distributor_enterprise)]) } diff --git a/spec/controllers/spree/admin/products_controller_spec.rb b/spec/controllers/spree/admin/products_controller_spec.rb index d98c7be540..af89e197fc 100644 --- a/spec/controllers/spree/admin/products_controller_spec.rb +++ b/spec/controllers/spree/admin/products_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Spree::Admin::ProductsController, type: :controller do +RSpec.describe Spree::Admin::ProductsController do describe 'bulk_update' do context "updating a product we do not have access to" do let(:s_managed) { create(:enterprise) } diff --git a/spec/controllers/spree/admin/return_authorizations_controller_spec.rb b/spec/controllers/spree/admin/return_authorizations_controller_spec.rb index d76ee014bd..cbc69ec18b 100644 --- a/spec/controllers/spree/admin/return_authorizations_controller_spec.rb +++ b/spec/controllers/spree/admin/return_authorizations_controller_spec.rb @@ -4,7 +4,7 @@ require 'spec_helper' module Spree module Admin - RSpec.describe ReturnAuthorizationsController, type: :controller do + RSpec.describe ReturnAuthorizationsController do include AuthenticationHelper let(:order) { create(:shipped_order, distributor: create(:distributor_enterprise)) } diff --git a/spec/controllers/spree/admin/search_controller_spec.rb b/spec/controllers/spree/admin/search_controller_spec.rb index 2354e1869d..18fff364af 100644 --- a/spec/controllers/spree/admin/search_controller_spec.rb +++ b/spec/controllers/spree/admin/search_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Spree::Admin::SearchController, type: :controller do +RSpec.describe Spree::Admin::SearchController do context "Distributor Enterprise User" do let!(:owner) { create(:user, email: "test1@email.com" ) } let!(:manager) { create(:user, email: "test2@email.com" ) } diff --git a/spec/controllers/spree/admin/shipping_categories_controller_spec.rb b/spec/controllers/spree/admin/shipping_categories_controller_spec.rb index e7df05f5f4..ca956713a1 100644 --- a/spec/controllers/spree/admin/shipping_categories_controller_spec.rb +++ b/spec/controllers/spree/admin/shipping_categories_controller_spec.rb @@ -4,7 +4,7 @@ require 'spec_helper' module Spree module Admin - RSpec.describe ShippingCategoriesController, type: :controller do + RSpec.describe ShippingCategoriesController do include AuthenticationHelper describe "#create and #update" do diff --git a/spec/controllers/spree/admin/shipping_methods_controller_spec.rb b/spec/controllers/spree/admin/shipping_methods_controller_spec.rb index efdb46d78c..422352542b 100644 --- a/spec/controllers/spree/admin/shipping_methods_controller_spec.rb +++ b/spec/controllers/spree/admin/shipping_methods_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Spree::Admin::ShippingMethodsController, type: :controller do +RSpec.describe Spree::Admin::ShippingMethodsController do include AuthenticationHelper describe "#update" do diff --git a/spec/controllers/spree/admin/tax_rates_controller_spec.rb b/spec/controllers/spree/admin/tax_rates_controller_spec.rb index ad9bc2cb72..5a4fb2c6e2 100644 --- a/spec/controllers/spree/admin/tax_rates_controller_spec.rb +++ b/spec/controllers/spree/admin/tax_rates_controller_spec.rb @@ -4,7 +4,7 @@ require 'spec_helper' module Spree module Admin - RSpec.describe TaxRatesController, type: :controller do + RSpec.describe TaxRatesController do include AuthenticationHelper let!(:default_tax_zone) { create(:zone, default_tax: true) } diff --git a/spec/controllers/spree/admin/tax_settings_controller_spec.rb b/spec/controllers/spree/admin/tax_settings_controller_spec.rb index e41d1825a4..af804d4ba4 100644 --- a/spec/controllers/spree/admin/tax_settings_controller_spec.rb +++ b/spec/controllers/spree/admin/tax_settings_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Spree::Admin::TaxSettingsController, type: :controller do +RSpec.describe Spree::Admin::TaxSettingsController do describe "#update" do let(:params) { { preferences: { products_require_tax_category: "1" } } } diff --git a/spec/controllers/spree/admin/variants_controller_spec.rb b/spec/controllers/spree/admin/variants_controller_spec.rb index dda0c01dab..5ca4491838 100644 --- a/spec/controllers/spree/admin/variants_controller_spec.rb +++ b/spec/controllers/spree/admin/variants_controller_spec.rb @@ -4,7 +4,7 @@ require 'spec_helper' module Spree module Admin - RSpec.describe VariantsController, type: :controller do + RSpec.describe VariantsController do context "log in as admin user" do before { controller_login_as_admin } diff --git a/spec/controllers/spree/api_keys_controller_spec.rb b/spec/controllers/spree/api_keys_controller_spec.rb index 5b3162acc0..87522e8546 100644 --- a/spec/controllers/spree/api_keys_controller_spec.rb +++ b/spec/controllers/spree/api_keys_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Spree::ApiKeysController, type: :controller, performance: true do +RSpec.describe Spree::ApiKeysController, performance: true do routes { Spree::Core::Engine.routes } include AuthenticationHelper diff --git a/spec/controllers/spree/credit_cards_controller_spec.rb b/spec/controllers/spree/credit_cards_controller_spec.rb index 184cfba059..6207eae50e 100644 --- a/spec/controllers/spree/credit_cards_controller_spec.rb +++ b/spec/controllers/spree/credit_cards_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Spree::CreditCardsController, type: :controller do +RSpec.describe Spree::CreditCardsController do describe "using VCR", :vcr, :stripe_version do let(:user) { create(:user) } diff --git a/spec/controllers/spree/orders_controller_spec.rb b/spec/controllers/spree/orders_controller_spec.rb index 685cf07268..95c56dc658 100644 --- a/spec/controllers/spree/orders_controller_spec.rb +++ b/spec/controllers/spree/orders_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Spree::OrdersController, type: :controller do +RSpec.describe Spree::OrdersController do include CheckoutHelper include StripeStubs diff --git a/spec/controllers/spree/user_sessions_controller_spec.rb b/spec/controllers/spree/user_sessions_controller_spec.rb index 5f03575263..cea3cc23e6 100644 --- a/spec/controllers/spree/user_sessions_controller_spec.rb +++ b/spec/controllers/spree/user_sessions_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Spree::UserSessionsController, type: :controller do +RSpec.describe Spree::UserSessionsController do let(:user) { create(:user) } before do diff --git a/spec/controllers/spree/users_controller_spec.rb b/spec/controllers/spree/users_controller_spec.rb index 6eff295eb6..2ff2d2aa42 100644 --- a/spec/controllers/spree/users_controller_spec.rb +++ b/spec/controllers/spree/users_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Spree::UsersController, type: :controller do +RSpec.describe Spree::UsersController do routes { Spree::Core::Engine.routes } include AuthenticationHelper diff --git a/spec/controllers/stripe/callbacks_controller_spec.rb b/spec/controllers/stripe/callbacks_controller_spec.rb index cb88f76256..4dc122a1a3 100644 --- a/spec/controllers/stripe/callbacks_controller_spec.rb +++ b/spec/controllers/stripe/callbacks_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Stripe::CallbacksController, type: :controller do +RSpec.describe Stripe::CallbacksController do let(:enterprise) { create(:distributor_enterprise) } context "#index" do diff --git a/spec/controllers/stripe/webhooks_controller_spec.rb b/spec/controllers/stripe/webhooks_controller_spec.rb index 0c54efb54e..ad289cb7a9 100644 --- a/spec/controllers/stripe/webhooks_controller_spec.rb +++ b/spec/controllers/stripe/webhooks_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Stripe::WebhooksController, type: :controller do +RSpec.describe Stripe::WebhooksController do describe "#create" do let(:params) do { diff --git a/spec/controllers/user_confirmations_controller_spec.rb b/spec/controllers/user_confirmations_controller_spec.rb index d276d4c874..c19768c8ee 100644 --- a/spec/controllers/user_confirmations_controller_spec.rb +++ b/spec/controllers/user_confirmations_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe UserConfirmationsController, type: :controller do +RSpec.describe UserConfirmationsController do let!(:user) { create(:user) } let!(:confirmed_user) { create(:user, confirmed_at: nil) } let!(:unconfirmed_user) { create(:user, confirmed_at: nil) } diff --git a/spec/controllers/user_passwords_controller_spec.rb b/spec/controllers/user_passwords_controller_spec.rb index 3db687cfc2..d873c7df96 100644 --- a/spec/controllers/user_passwords_controller_spec.rb +++ b/spec/controllers/user_passwords_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe UserPasswordsController, type: :controller do +RSpec.describe UserPasswordsController do render_views let(:user) { create(:user) } diff --git a/spec/controllers/user_registrations_controller_spec.rb b/spec/controllers/user_registrations_controller_spec.rb index db83429068..559cec3569 100644 --- a/spec/controllers/user_registrations_controller_spec.rb +++ b/spec/controllers/user_registrations_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe UserRegistrationsController, type: :controller do +RSpec.describe UserRegistrationsController do before do @request.env["devise.mapping"] = Devise.mappings[:spree_user] end diff --git a/spec/controllers/webhook_endpoints_controller_spec.rb b/spec/controllers/webhook_endpoints_controller_spec.rb index bd6ea07961..4eb2e50f1a 100644 --- a/spec/controllers/webhook_endpoints_controller_spec.rb +++ b/spec/controllers/webhook_endpoints_controller_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' require 'open_food_network/order_cycle_permissions' -RSpec.describe WebhookEndpointsController, type: :controller do +RSpec.describe WebhookEndpointsController do let(:user) { create(:admin_user) } before { allow(controller).to receive(:spree_current_user) { user } } diff --git a/spec/helpers/admin/enterprises_helper_spec.rb b/spec/helpers/admin/enterprises_helper_spec.rb index aae01ab5ea..cbb9c72ffd 100644 --- a/spec/helpers/admin/enterprises_helper_spec.rb +++ b/spec/helpers/admin/enterprises_helper_spec.rb @@ -2,7 +2,7 @@ require "spec_helper" -RSpec.describe Admin::EnterprisesHelper, type: :helper do +RSpec.describe Admin::EnterprisesHelper do let(:user) { build(:user) } before do diff --git a/spec/helpers/admin/orders_helper_spec.rb b/spec/helpers/admin/orders_helper_spec.rb index a9b301af5e..9a1f9e9306 100644 --- a/spec/helpers/admin/orders_helper_spec.rb +++ b/spec/helpers/admin/orders_helper_spec.rb @@ -2,7 +2,7 @@ require "spec_helper" -RSpec.describe Admin::OrdersHelper, type: :helper do +RSpec.describe Admin::OrdersHelper do describe "#order_adjustments_for_display" do let(:order) { create(:order) } let(:service) { instance_double(VoucherAdjustmentsService, voucher_included_tax:) } diff --git a/spec/helpers/admin/reports_helper_spec.rb b/spec/helpers/admin/reports_helper_spec.rb index 0cd63d9037..6f2f0c33e4 100644 --- a/spec/helpers/admin/reports_helper_spec.rb +++ b/spec/helpers/admin/reports_helper_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe ReportsHelper, type: :helper do +RSpec.describe ReportsHelper do describe "#report_payment_method_options" do let(:order_with_payments) { create(:order_ready_to_ship) } let(:order_without_payments) { create(:order_with_line_items) } diff --git a/spec/helpers/admin/subscriptions_helper_spec.rb b/spec/helpers/admin/subscriptions_helper_spec.rb index f4dc888ab3..c5e3ef23fa 100644 --- a/spec/helpers/admin/subscriptions_helper_spec.rb +++ b/spec/helpers/admin/subscriptions_helper_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Admin::SubscriptionsHelper, type: :helper do +RSpec.describe Admin::SubscriptionsHelper do describe "checking if setup is complete for any [shop]" do let(:shop) { create(:distributor_enterprise) } let(:customer) { create(:customer, enterprise: shop) } diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb index c9aa5c7b0d..fe2679359c 100644 --- a/spec/helpers/application_helper_spec.rb +++ b/spec/helpers/application_helper_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe ApplicationHelper, type: :helper do +RSpec.describe ApplicationHelper do describe "#feature?" do it "takes several actors" do user = Spree::User.new(id: 4) diff --git a/spec/helpers/checkout_helper_spec.rb b/spec/helpers/checkout_helper_spec.rb index a6f8350a24..1303cdb148 100644 --- a/spec/helpers/checkout_helper_spec.rb +++ b/spec/helpers/checkout_helper_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe CheckoutHelper, type: :helper do +RSpec.describe CheckoutHelper do it "generates html for validated inputs" do expect(helper).to receive(:render).with( "shared/validated_input", diff --git a/spec/helpers/i18n_helper_spec.rb b/spec/helpers/i18n_helper_spec.rb index d8434d228c..884e010c85 100644 --- a/spec/helpers/i18n_helper_spec.rb +++ b/spec/helpers/i18n_helper_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe I18nHelper, type: :helper do +RSpec.describe I18nHelper do let(:user) { create(:user) } let(:cookies) { {} } diff --git a/spec/helpers/injection_helper_spec.rb b/spec/helpers/injection_helper_spec.rb index 1001d763a1..cd0b57d29b 100644 --- a/spec/helpers/injection_helper_spec.rb +++ b/spec/helpers/injection_helper_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe InjectionHelper, type: :helper do +RSpec.describe InjectionHelper do let!(:enterprise) { create(:distributor_enterprise, facebook: "roger") } let!(:distributor1) { create(:distributor_enterprise) } diff --git a/spec/helpers/link_helper_spec.rb b/spec/helpers/link_helper_spec.rb index cf7c6a07c5..14dc507343 100644 --- a/spec/helpers/link_helper_spec.rb +++ b/spec/helpers/link_helper_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe LinkHelper, type: :helper do +RSpec.describe LinkHelper do describe "ext_url" do it "adds prefix if missing" do expect(helper.ext_url("http://example.com/", "http://example.com/bla")).to eq("http://example.com/bla") diff --git a/spec/helpers/navigation_helper_spec.rb b/spec/helpers/navigation_helper_spec.rb index e5a9a40c00..d2bc2be68d 100644 --- a/spec/helpers/navigation_helper_spec.rb +++ b/spec/helpers/navigation_helper_spec.rb @@ -4,7 +4,7 @@ require 'spec_helper' module Spree module Admin - RSpec.describe NavigationHelper, type: :helper do + RSpec.describe NavigationHelper do describe "klass_for" do it "returns the class when present" do expect(helper.klass_for('products')).to eq(Spree::Product) diff --git a/spec/helpers/order_cycles_helper_spec.rb b/spec/helpers/order_cycles_helper_spec.rb index aaf39267bc..97d9f2bad9 100644 --- a/spec/helpers/order_cycles_helper_spec.rb +++ b/spec/helpers/order_cycles_helper_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe OrderCyclesHelper, type: :helper do +RSpec.describe OrderCyclesHelper do let(:oc) { double(:order_cycle) } describe "finding producer enterprise options" do diff --git a/spec/helpers/serializer_helper_spec.rb b/spec/helpers/serializer_helper_spec.rb index 911515a7c3..d41ccc2d73 100644 --- a/spec/helpers/serializer_helper_spec.rb +++ b/spec/helpers/serializer_helper_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe SerializerHelper, type: :helper do +RSpec.describe SerializerHelper do let(:serializer) do Class.new(ActiveModel::Serializer) do attributes :id, :name diff --git a/spec/helpers/shop_helper_spec.rb b/spec/helpers/shop_helper_spec.rb index e59881d6ef..08697cb6cf 100644 --- a/spec/helpers/shop_helper_spec.rb +++ b/spec/helpers/shop_helper_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: false require 'spec_helper' -RSpec.describe ShopHelper, type: :helper do +RSpec.describe ShopHelper do describe "shop_tabs" do context "distributor with groups" do let(:group) { create(:enterprise_group) } diff --git a/spec/helpers/spree/admin/base_helper_spec.rb b/spec/helpers/spree/admin/base_helper_spec.rb index 958f7f2ae1..090cdd63d1 100644 --- a/spec/helpers/spree/admin/base_helper_spec.rb +++ b/spec/helpers/spree/admin/base_helper_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Spree::Admin::BaseHelper, type: :helper do +RSpec.describe Spree::Admin::BaseHelper do helper 'spree/admin/navigation' describe "#link_to_remove_fields" do diff --git a/spec/helpers/spree/admin/general_settings_helper_spec.rb b/spec/helpers/spree/admin/general_settings_helper_spec.rb index c5713c6dec..877578e39d 100644 --- a/spec/helpers/spree/admin/general_settings_helper_spec.rb +++ b/spec/helpers/spree/admin/general_settings_helper_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Spree::Admin::GeneralSettingsHelper, type: :helper do +RSpec.describe Spree::Admin::GeneralSettingsHelper do describe "#all_units" do it "returns all units" do expect(helper.all_units).to eq(["mg", "g", "kg", "T", "oz", "lb", "mL", "cL", "dL", "L", diff --git a/spec/helpers/spree/admin/orders_helper_spec.rb b/spec/helpers/spree/admin/orders_helper_spec.rb index 80e93996e1..6b047774fa 100644 --- a/spec/helpers/spree/admin/orders_helper_spec.rb +++ b/spec/helpers/spree/admin/orders_helper_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Spree::Admin::OrdersHelper, type: :helper do +RSpec.describe Spree::Admin::OrdersHelper do describe "#orders_links" do let(:order) { double(:order) } let(:distributor) { double(:enterprise) } diff --git a/spec/helpers/spree/orders_helper_spec.rb b/spec/helpers/spree/orders_helper_spec.rb index a74ce38e9e..dc384e2a7a 100644 --- a/spec/helpers/spree/orders_helper_spec.rb +++ b/spec/helpers/spree/orders_helper_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Spree::OrdersHelper, type: :helper do +RSpec.describe Spree::OrdersHelper do describe "#changeable_orders" do let(:complete_orders) { double(:complete_orders, where: "some_orders") } diff --git a/spec/helpers/tax_helper_spec.rb b/spec/helpers/tax_helper_spec.rb index 2d262d8486..0b9ad20e98 100644 --- a/spec/helpers/tax_helper_spec.rb +++ b/spec/helpers/tax_helper_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe TaxHelper, type: :helper do +RSpec.describe TaxHelper do let(:line_item) { create(:line_item) } let(:line_item2) { create(:line_item) } let(:line_item3) { create(:line_item) } diff --git a/spec/helpers/terms_and_conditions_helper_spec.rb b/spec/helpers/terms_and_conditions_helper_spec.rb index 100fc3e80d..a62e6aa049 100644 --- a/spec/helpers/terms_and_conditions_helper_spec.rb +++ b/spec/helpers/terms_and_conditions_helper_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe TermsAndConditionsHelper, type: :helper do +RSpec.describe TermsAndConditionsHelper do describe "#platform_terms_required?" do context 'when ToS file is present' do before do diff --git a/spec/jobs/connect_app_job_spec.rb b/spec/jobs/connect_app_job_spec.rb index 0dd232d14f..118dddb3a3 100644 --- a/spec/jobs/connect_app_job_spec.rb +++ b/spec/jobs/connect_app_job_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe ConnectAppJob, type: :job do +RSpec.describe ConnectAppJob do subject { ConnectAppJob.new(app, user.spree_api_key) } let(:app) { ConnectedApp.new(enterprise: ) } diff --git a/spec/mailers/producer_mailer_spec.rb b/spec/mailers/producer_mailer_spec.rb index e0f01764d1..09cee70f1d 100644 --- a/spec/mailers/producer_mailer_spec.rb +++ b/spec/mailers/producer_mailer_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' require 'yaml' -RSpec.describe ProducerMailer, type: :mailer do +RSpec.describe ProducerMailer do let!(:zone) { create(:zone_with_member) } let!(:tax_rate) { create(:tax_rate, included_in_price: true, calculator: Calculator::DefaultTax.new, zone:, diff --git a/spec/mailers/subscription_mailer_spec.rb b/spec/mailers/subscription_mailer_spec.rb index 9653423b9a..f79f81e9e6 100644 --- a/spec/mailers/subscription_mailer_spec.rb +++ b/spec/mailers/subscription_mailer_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe SubscriptionMailer, type: :mailer do +RSpec.describe SubscriptionMailer do include ActionView::Helpers::SanitizeHelper describe '#placement_email' do diff --git a/spec/models/column_preference_spec.rb b/spec/models/column_preference_spec.rb index 99f6402987..b043bd53db 100644 --- a/spec/models/column_preference_spec.rb +++ b/spec/models/column_preference_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe ColumnPreference, type: :model do +RSpec.describe ColumnPreference do subject { ColumnPreference.new( user:, action_name: :customers_index, column_name: :email diff --git a/spec/models/connected_app_spec.rb b/spec/models/connected_app_spec.rb index 57dd56d4c3..b8d5749443 100644 --- a/spec/models/connected_app_spec.rb +++ b/spec/models/connected_app_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe ConnectedApp, type: :model do +RSpec.describe ConnectedApp do it { is_expected.to belong_to :enterprise } it "stores data as json hash" do diff --git a/spec/models/customer_spec.rb b/spec/models/customer_spec.rb index bb488b6993..4aaf749067 100644 --- a/spec/models/customer_spec.rb +++ b/spec/models/customer_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Customer, type: :model do +RSpec.describe Customer do it { is_expected.to belong_to(:enterprise).required } it { is_expected.to belong_to(:user).optional } it { is_expected.to belong_to(:bill_address).optional } diff --git a/spec/models/invoice_spec.rb b/spec/models/invoice_spec.rb index b5a3fd94a8..35b8aab258 100644 --- a/spec/models/invoice_spec.rb +++ b/spec/models/invoice_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Invoice, type: :model do +RSpec.describe Invoice do let(:distributor) { create(:distributor_enterprise) } let(:order) { create(:order, :with_line_item, :completed, distributor:) } describe 'presenter' do diff --git a/spec/models/oidc_account_spec.rb b/spec/models/oidc_account_spec.rb index f6eb2d792d..7ce379d299 100644 --- a/spec/models/oidc_account_spec.rb +++ b/spec/models/oidc_account_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe OidcAccount, type: :model do +RSpec.describe OidcAccount do describe "associations and validations" do subject { OidcAccount.new( diff --git a/spec/models/proxy_order_spec.rb b/spec/models/proxy_order_spec.rb index 7fe6b76620..dbec3b6833 100644 --- a/spec/models/proxy_order_spec.rb +++ b/spec/models/proxy_order_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe ProxyOrder, type: :model do +RSpec.describe ProxyOrder do describe "cancel" do let(:order_cycle) { create(:simple_order_cycle) } let(:subscription) { create(:subscription) } diff --git a/spec/models/report_blob_spec.rb b/spec/models/report_blob_spec.rb index 32cfd69a9d..1622b77c6f 100644 --- a/spec/models/report_blob_spec.rb +++ b/spec/models/report_blob_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe ReportBlob, type: :model do +RSpec.describe ReportBlob do it "preserves UTF-8 content" do content = "This works. ✓" diff --git a/spec/models/semantic_link_spec.rb b/spec/models/semantic_link_spec.rb index 6d881980ea..ac82a766e1 100644 --- a/spec/models/semantic_link_spec.rb +++ b/spec/models/semantic_link_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe SemanticLink, type: :model do +RSpec.describe SemanticLink do it { is_expected.to belong_to :subject } it { is_expected.to validate_presence_of(:semantic_id) } end diff --git a/spec/models/spree/gateway/stripe_sca_spec.rb b/spec/models/spree/gateway/stripe_sca_spec.rb index 1b9c28863e..489c9fc90f 100644 --- a/spec/models/spree/gateway/stripe_sca_spec.rb +++ b/spec/models/spree/gateway/stripe_sca_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Spree::Gateway::StripeSCA, :vcr, :stripe_version, type: :model do +RSpec.describe Spree::Gateway::StripeSCA, :vcr, :stripe_version do let(:order) { create(:order_ready_for_payment) } let(:year_valid) { Time.zone.now.year.next } diff --git a/spec/models/subscription_spec.rb b/spec/models/subscription_spec.rb index b4e3eee043..13a320cf45 100644 --- a/spec/models/subscription_spec.rb +++ b/spec/models/subscription_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Subscription, type: :model do +RSpec.describe Subscription do describe "associations" do it { expect(subject).to belong_to(:shop).optional } it { expect(subject).to belong_to(:customer).optional } diff --git a/spec/models/tag_rule/filter_order_cycles_spec.rb b/spec/models/tag_rule/filter_order_cycles_spec.rb index da96f716e2..ed9529ab8b 100644 --- a/spec/models/tag_rule/filter_order_cycles_spec.rb +++ b/spec/models/tag_rule/filter_order_cycles_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe TagRule::FilterOrderCycles, type: :model do +RSpec.describe TagRule::FilterOrderCycles do let!(:tag_rule) { build_stubbed(:filter_order_cycles_tag_rule) } describe "determining whether tags match for a given exchange" do diff --git a/spec/models/tag_rule/filter_payment_methods_spec.rb b/spec/models/tag_rule/filter_payment_methods_spec.rb index a371c38c04..633a65a3f2 100644 --- a/spec/models/tag_rule/filter_payment_methods_spec.rb +++ b/spec/models/tag_rule/filter_payment_methods_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe TagRule::FilterPaymentMethods, type: :model do +RSpec.describe TagRule::FilterPaymentMethods do let!(:tag_rule) { build_stubbed(:filter_payment_methods_tag_rule) } describe "determining whether tags match for a given payment method" do diff --git a/spec/models/tag_rule/filter_products_spec.rb b/spec/models/tag_rule/filter_products_spec.rb index 9b96c4b35d..61aace0e28 100644 --- a/spec/models/tag_rule/filter_products_spec.rb +++ b/spec/models/tag_rule/filter_products_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe TagRule::FilterProducts, type: :model do +RSpec.describe TagRule::FilterProducts do let!(:tag_rule) { build_stubbed(:filter_products_tag_rule) } describe "determining whether tags match for a given variant" do diff --git a/spec/models/tag_rule/filter_shipping_methods_spec.rb b/spec/models/tag_rule/filter_shipping_methods_spec.rb index d7c8b37c39..8e53c51eb0 100644 --- a/spec/models/tag_rule/filter_shipping_methods_spec.rb +++ b/spec/models/tag_rule/filter_shipping_methods_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe TagRule::FilterShippingMethods, type: :model do +RSpec.describe TagRule::FilterShippingMethods do let!(:tag_rule) { build_stubbed(:filter_shipping_methods_tag_rule) } describe "determining whether tags match for a given shipping method" do diff --git a/spec/models/tag_rule_spec.rb b/spec/models/tag_rule_spec.rb index 738263cf34..b3dac6ac20 100644 --- a/spec/models/tag_rule_spec.rb +++ b/spec/models/tag_rule_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe TagRule, type: :model do +RSpec.describe TagRule do describe "validations" do it "requires a enterprise" do expect(subject).to belong_to(:enterprise) diff --git a/spec/models/webhook_endpoint_spec.rb b/spec/models/webhook_endpoint_spec.rb index 0150037a3f..2aba887175 100644 --- a/spec/models/webhook_endpoint_spec.rb +++ b/spec/models/webhook_endpoint_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe WebhookEndpoint, type: :model do +RSpec.describe WebhookEndpoint do describe "validations" do it { is_expected.to validate_presence_of(:url) } end diff --git a/spec/requests/admin/images_spec.rb b/spec/requests/admin/images_spec.rb index a62f9bef81..f86f36b86a 100644 --- a/spec/requests/admin/images_spec.rb +++ b/spec/requests/admin/images_spec.rb @@ -2,7 +2,7 @@ require "spec_helper" -RSpec.describe "/admin/products/:product_id/images", type: :request do +RSpec.describe "/admin/products/:product_id/images" do include AuthenticationHelper let!(:product) { create(:product) } diff --git a/spec/requests/admin/product_import_spec.rb b/spec/requests/admin/product_import_spec.rb index b3c968748d..de6e066817 100644 --- a/spec/requests/admin/product_import_spec.rb +++ b/spec/requests/admin/product_import_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe "Product Import", type: :request do +RSpec.describe "Product Import" do include AuthenticationHelper describe "validate_data" do diff --git a/spec/requests/admin/vouchers_spec.rb b/spec/requests/admin/vouchers_spec.rb index 64c16ef7ff..3c3eb7e6fb 100644 --- a/spec/requests/admin/vouchers_spec.rb +++ b/spec/requests/admin/vouchers_spec.rb @@ -2,7 +2,7 @@ require "spec_helper" -RSpec.describe "/admin/enterprises/:enterprise_id/vouchers", type: :request do +RSpec.describe "/admin/enterprises/:enterprise_id/vouchers" do let(:enterprise) { create(:supplier_enterprise, name: "Feedme") } let(:enterprise_user) { create(:user, enterprise_limit: 1) } diff --git a/spec/requests/api/orders_spec.rb b/spec/requests/api/orders_spec.rb index 88078720b8..2e72d07eba 100644 --- a/spec/requests/api/orders_spec.rb +++ b/spec/requests/api/orders_spec.rb @@ -2,7 +2,7 @@ require 'swagger_helper' -RSpec.describe 'api/v0/orders', swagger_doc: 'v0.yaml', type: :request do +RSpec.describe 'api/v0/orders', swagger_doc: 'v0.yaml' do path '/api/v0/orders' do get('list orders') do tags 'Orders' diff --git a/spec/requests/api/routes_spec.rb b/spec/requests/api/routes_spec.rb index 1ea8b2287c..a702010471 100644 --- a/spec/requests/api/routes_spec.rb +++ b/spec/requests/api/routes_spec.rb @@ -3,7 +3,7 @@ # test a single endpoint to make sure the redirects are working as intended. require 'spec_helper' -RSpec.describe 'Orders Cycles endpoint', type: :request do +RSpec.describe 'Orders Cycles endpoint' do let(:distributor) { create(:distributor_enterprise) } let(:order_cycle) { create(:order_cycle, distributors: [distributor]) } diff --git a/spec/requests/api/v1/customers_spec.rb b/spec/requests/api/v1/customers_spec.rb index bc9e8308cc..0d10c3ef0c 100644 --- a/spec/requests/api/v1/customers_spec.rb +++ b/spec/requests/api/v1/customers_spec.rb @@ -2,7 +2,7 @@ require "swagger_helper" -RSpec.describe "Customers", type: :request, swagger_doc: "v1.yaml", feature: :api_v1 do +RSpec.describe "Customers", swagger_doc: "v1.yaml", feature: :api_v1 do let!(:enterprise1) { create(:enterprise, name: "The Farm") } let!(:enterprise2) { create(:enterprise) } let!(:enterprise3) { create(:enterprise) } diff --git a/spec/requests/api_docs_spec.rb b/spec/requests/api_docs_spec.rb index f2d8fb5ab6..57ec4292e1 100644 --- a/spec/requests/api_docs_spec.rb +++ b/spec/requests/api_docs_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe "API documentation", type: :request do +RSpec.describe "API documentation" do it "shows the OFN API v1" do get rswag_ui_path expect(response).to redirect_to "/api-docs/index.html" diff --git a/spec/requests/checkout/paypal_spec.rb b/spec/requests/checkout/paypal_spec.rb index a5cbe87a8a..05eab82d63 100644 --- a/spec/requests/checkout/paypal_spec.rb +++ b/spec/requests/checkout/paypal_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe "checking out an order with a paypal express payment method", type: :request do +RSpec.describe "checking out an order with a paypal express payment method" do include ShopWorkflow include PaypalHelper diff --git a/spec/requests/checkout/routes_spec.rb b/spec/requests/checkout/routes_spec.rb index 9ae03183bb..6cbe586d3a 100644 --- a/spec/requests/checkout/routes_spec.rb +++ b/spec/requests/checkout/routes_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'checkout endpoints', type: :request do +RSpec.describe 'checkout endpoints' do include ShopWorkflow let!(:shop) { create(:enterprise) } diff --git a/spec/requests/checkout/stripe_sca_spec.rb b/spec/requests/checkout/stripe_sca_spec.rb index fc67d17910..12af937792 100644 --- a/spec/requests/checkout/stripe_sca_spec.rb +++ b/spec/requests/checkout/stripe_sca_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe "checking out an order with a Stripe SCA payment method", type: :request do +RSpec.describe "checking out an order with a Stripe SCA payment method" do include ShopWorkflow include AuthenticationHelper include OpenFoodNetwork::ApiHelper diff --git a/spec/requests/errors_spec.rb b/spec/requests/errors_spec.rb index 0d44cc5ada..f0a364749a 100644 --- a/spec/requests/errors_spec.rb +++ b/spec/requests/errors_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Errors', type: :request do +RSpec.describe 'Errors' do include ExceptionHelper shared_examples "returning a HTTP 404" do |path| diff --git a/spec/requests/home_controller_spec.rb b/spec/requests/home_controller_spec.rb index b5ba8111db..04c9eab414 100644 --- a/spec/requests/home_controller_spec.rb +++ b/spec/requests/home_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe HomeController, type: :request do +RSpec.describe HomeController do context "#unauthorized" do it "renders the unauthorized template" do get "/unauthorized" diff --git a/spec/requests/large_request_spec.rb b/spec/requests/large_request_spec.rb index 2bb91d853f..ce5fbefb59 100644 --- a/spec/requests/large_request_spec.rb +++ b/spec/requests/large_request_spec.rb @@ -5,7 +5,7 @@ # http://daniel.fone.net.nz/blog/2014/11/28/actiondispatch-cookies-cookieoverflow-via-devise-s-user_return_to/ require 'spec_helper' -RSpec.describe 'A very large request', type: :request do +RSpec.describe 'A very large request' do it 'should not overflow cookies' do get '/admin', params: { foo: 'x' * ActionDispatch::Cookies::MAX_COOKIE_SIZE } expect(response).to have_http_status(:redirect) diff --git a/spec/requests/omniauth_callbacks_controller_spec.rb b/spec/requests/omniauth_callbacks_controller_spec.rb index d416559850..27f1ba9a54 100644 --- a/spec/requests/omniauth_callbacks_controller_spec.rb +++ b/spec/requests/omniauth_callbacks_controller_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' # Devise calls OmniauthCallbacksController for OpenID Connect callbacks. -RSpec.describe '/user/spree_user/auth/openid_connect/callback', type: :request do +RSpec.describe '/user/spree_user/auth/openid_connect/callback' do include AuthenticationHelper let(:user) { create(:user) } diff --git a/spec/requests/spree/admin/overview_spec.rb b/spec/requests/spree/admin/overview_spec.rb index 4d5739f88c..8649f0f57d 100644 --- a/spec/requests/spree/admin/overview_spec.rb +++ b/spec/requests/spree/admin/overview_spec.rb @@ -2,7 +2,7 @@ require "spec_helper" -RSpec.describe "/admin", type: :request do +RSpec.describe "/admin" do let(:enterprise) { create(:supplier_enterprise, name: "Feedme") } let(:enterprise_user) { create(:user, enterprise_limit: 1) } diff --git a/spec/requests/spree/admin/payments_spec.rb b/spec/requests/spree/admin/payments_spec.rb index f8e9f6e3c6..2a60c8cfa6 100644 --- a/spec/requests/spree/admin/payments_spec.rb +++ b/spec/requests/spree/admin/payments_spec.rb @@ -2,7 +2,7 @@ require "spec_helper" -RSpec.describe Spree::Admin::PaymentsController, type: :request do +RSpec.describe Spree::Admin::PaymentsController do let(:user) { order.user } let(:order) { create(:completed_order_with_fees) } diff --git a/spec/requests/voucher_adjustments_spec.rb b/spec/requests/voucher_adjustments_spec.rb index e4b3712a46..34c374e30d 100644 --- a/spec/requests/voucher_adjustments_spec.rb +++ b/spec/requests/voucher_adjustments_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe VoucherAdjustmentsController, type: :request do +RSpec.describe VoucherAdjustmentsController do let(:user) { order.user } let(:address) { create(:address) } let(:distributor) { create(:distributor_enterprise, with_payment_and_shipping: true) } diff --git a/spec/routing/stripe_spec.rb b/spec/routing/stripe_spec.rb index f9b0403233..8f51a48e44 100644 --- a/spec/routing/stripe_spec.rb +++ b/spec/routing/stripe_spec.rb @@ -2,7 +2,7 @@ require "spec_helper" -RSpec.describe "routing for Stripe return URLS", type: :routing do +RSpec.describe "routing for Stripe return URLS" do context "checkout return URLs" do it "routes /checkout to checkout#edit" do expect(get: "checkout").