Merge pull request #5224 from solidusio/elia/current-store-default-do…

…main

Ensure the fallback `current_store` has a domain set

core/app/models/spree/store_selector/by_server_name.rb

@@ -25,7 +25,7 @@ def store
         store = Spree::Store.where(url: server_name).or(Store.where(default: true)).order(default: :asc).first
 
         # Provide a fallback, mostly for legacy/testing purposes
-        store || Spree::Store.new
+        store || Spree::Store.new(url: server_name)
       end
     end
   end

core/spec/models/spree/store_selector/by_server_name_spec.rb

@@ -5,6 +5,13 @@
 RSpec.describe Spree::StoreSelector::ByServerName do
   describe "#store" do
     subject { described_class.new(request).store }
+    let(:request) { double(headers: {}, env: { "SERVER_NAME" => "www.example.com" } ) }
+
+    context "with no match" do
+      it "returns a new store with current domain as the url" do
+        expect(subject).to be_a_new(Spree::Store).with(url: "www.example.com")
+      end
+    end
 
     context "with a default" do
       let(:request) { double(headers: {}, env: {}) }