From 191c4a79db9ee4ddf22e1a06f2b0de0a2e5ff700 Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Thu, 10 Aug 2023 15:55:28 +1000 Subject: [PATCH] Load spec helpers before Rails is loaded Using Spring was hiding an loading error. When you start Rspec, Rails and its engines are not loaded yet. So our way to load the spec helper via `Rails.root` did not work when you ran specs on their own without loading Rails with Spring first. --- engines/dfc_provider/spec/requests/catalog_items_spec.rb | 2 +- engines/dfc_provider/spec/requests/enterprises_spec.rb | 2 +- engines/dfc_provider/spec/requests/persons_spec.rb | 2 +- engines/dfc_provider/spec/requests/supplied_products_spec.rb | 2 +- .../dfc_provider/spec/services/authorization_control_spec.rb | 2 +- engines/dfc_provider/spec/services/catalog_item_builder_spec.rb | 2 +- engines/dfc_provider/spec/services/dfc_io_spec.rb | 2 +- engines/dfc_provider/spec/services/dfc_loader_spec.rb | 2 +- engines/dfc_provider/spec/services/enterprise_builder_spec.rb | 2 +- engines/dfc_provider/spec/services/offer_builder_spec.rb | 2 +- .../spec/services/quantitative_value_builder_spec.rb | 2 +- .../dfc_provider/spec/services/supplied_product_builder_spec.rb | 2 +- engines/dfc_provider/spec/swagger_helper.rb | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/engines/dfc_provider/spec/requests/catalog_items_spec.rb b/engines/dfc_provider/spec/requests/catalog_items_spec.rb index 2d78ab765a..a8ef916564 100644 --- a/engines/dfc_provider/spec/requests/catalog_items_spec.rb +++ b/engines/dfc_provider/spec/requests/catalog_items_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require DfcProvider::Engine.root.join("spec/swagger_helper") +require_relative "../swagger_helper" describe "CatalogItems", type: :request, swagger_doc: "dfc-v1.7/swagger.yaml", rswag_autodoc: true do diff --git a/engines/dfc_provider/spec/requests/enterprises_spec.rb b/engines/dfc_provider/spec/requests/enterprises_spec.rb index 7d73617d8c..b9e5f5fef7 100644 --- a/engines/dfc_provider/spec/requests/enterprises_spec.rb +++ b/engines/dfc_provider/spec/requests/enterprises_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require DfcProvider::Engine.root.join("spec/swagger_helper") +require_relative "../swagger_helper" describe "Enterprises", type: :request, swagger_doc: "dfc-v1.7/swagger.yaml", rswag_autodoc: true do let!(:user) { create(:oidc_user) } diff --git a/engines/dfc_provider/spec/requests/persons_spec.rb b/engines/dfc_provider/spec/requests/persons_spec.rb index f31c2a49ee..cba4a1214d 100644 --- a/engines/dfc_provider/spec/requests/persons_spec.rb +++ b/engines/dfc_provider/spec/requests/persons_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require DfcProvider::Engine.root.join("spec/swagger_helper") +require_relative "../swagger_helper" describe "Persons", type: :request, swagger_doc: "dfc-v1.7/swagger.yaml", rswag_autodoc: true do let(:user) { create(:oidc_user, id: 10_000) } diff --git a/engines/dfc_provider/spec/requests/supplied_products_spec.rb b/engines/dfc_provider/spec/requests/supplied_products_spec.rb index c4d9ef1d6e..a97efcdc7d 100644 --- a/engines/dfc_provider/spec/requests/supplied_products_spec.rb +++ b/engines/dfc_provider/spec/requests/supplied_products_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require DfcProvider::Engine.root.join("spec/swagger_helper") +require_relative "../swagger_helper" describe "SuppliedProducts", type: :request, swagger_doc: "dfc-v1.7/swagger.yaml", rswag_autodoc: true do diff --git a/engines/dfc_provider/spec/services/authorization_control_spec.rb b/engines/dfc_provider/spec/services/authorization_control_spec.rb index 88239f933e..ed1f4cfe97 100644 --- a/engines/dfc_provider/spec/services/authorization_control_spec.rb +++ b/engines/dfc_provider/spec/services/authorization_control_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require DfcProvider::Engine.root.join("spec/spec_helper") +require_relative "../spec_helper" describe AuthorizationControl do include AuthorizationHelper diff --git a/engines/dfc_provider/spec/services/catalog_item_builder_spec.rb b/engines/dfc_provider/spec/services/catalog_item_builder_spec.rb index 3470428366..34faefe66a 100644 --- a/engines/dfc_provider/spec/services/catalog_item_builder_spec.rb +++ b/engines/dfc_provider/spec/services/catalog_item_builder_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require DfcProvider::Engine.root.join("spec/spec_helper") +require_relative "../spec_helper" describe DfcBuilder do let(:variant) { build(:variant) } diff --git a/engines/dfc_provider/spec/services/dfc_io_spec.rb b/engines/dfc_provider/spec/services/dfc_io_spec.rb index c236be4895..e95801853c 100644 --- a/engines/dfc_provider/spec/services/dfc_io_spec.rb +++ b/engines/dfc_provider/spec/services/dfc_io_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require DfcProvider::Engine.root.join("spec/spec_helper") +require_relative "../spec_helper" describe DfcIo do let(:person) do diff --git a/engines/dfc_provider/spec/services/dfc_loader_spec.rb b/engines/dfc_provider/spec/services/dfc_loader_spec.rb index a011c79e47..c36f05f75f 100644 --- a/engines/dfc_provider/spec/services/dfc_loader_spec.rb +++ b/engines/dfc_provider/spec/services/dfc_loader_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require DfcProvider::Engine.root.join("spec/spec_helper") +require_relative "../spec_helper" describe DfcLoader do it "prepares the DFC Connector to provide DFC object classes for export" do diff --git a/engines/dfc_provider/spec/services/enterprise_builder_spec.rb b/engines/dfc_provider/spec/services/enterprise_builder_spec.rb index ac4bfb1ade..c7ecc8f76a 100644 --- a/engines/dfc_provider/spec/services/enterprise_builder_spec.rb +++ b/engines/dfc_provider/spec/services/enterprise_builder_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require DfcProvider::Engine.root.join("spec/spec_helper") +require_relative "../spec_helper" describe EnterpriseBuilder do subject(:builder) { described_class } diff --git a/engines/dfc_provider/spec/services/offer_builder_spec.rb b/engines/dfc_provider/spec/services/offer_builder_spec.rb index 468e5ec052..3d0bf3256a 100644 --- a/engines/dfc_provider/spec/services/offer_builder_spec.rb +++ b/engines/dfc_provider/spec/services/offer_builder_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require DfcProvider::Engine.root.join("spec/spec_helper") +require_relative "../spec_helper" describe DfcBuilder do let(:variant) { build(:variant) } diff --git a/engines/dfc_provider/spec/services/quantitative_value_builder_spec.rb b/engines/dfc_provider/spec/services/quantitative_value_builder_spec.rb index bd744fa568..4d4382931a 100644 --- a/engines/dfc_provider/spec/services/quantitative_value_builder_spec.rb +++ b/engines/dfc_provider/spec/services/quantitative_value_builder_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require DfcProvider::Engine.root.join("spec/spec_helper") +require_relative "../spec_helper" describe QuantitativeValueBuilder do subject(:builder) { described_class } diff --git a/engines/dfc_provider/spec/services/supplied_product_builder_spec.rb b/engines/dfc_provider/spec/services/supplied_product_builder_spec.rb index b52aa1e737..f656c707c1 100644 --- a/engines/dfc_provider/spec/services/supplied_product_builder_spec.rb +++ b/engines/dfc_provider/spec/services/supplied_product_builder_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require DfcProvider::Engine.root.join("spec/spec_helper") +require_relative "../spec_helper" describe SuppliedProductBuilder do subject(:builder) { described_class } diff --git a/engines/dfc_provider/spec/swagger_helper.rb b/engines/dfc_provider/spec/swagger_helper.rb index 7de36d7a64..4a851e376d 100644 --- a/engines/dfc_provider/spec/swagger_helper.rb +++ b/engines/dfc_provider/spec/swagger_helper.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require Rails.root.join("spec/swagger_helper") +require_relative "../../../spec/swagger_helper" require_relative "spec_helper" RSpec.configure do |config|