solidus_multi_domain 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b8bdc0340da89be57fbe0bc2b9bb9bf6044576e
-  data.tar.gz: 5973b260b06c23a72a87aa8e8337ae441dec038f
+  metadata.gz: bb3f5dcfd0e9f2e1cd6eb1b6fc001442e04f37d7
+  data.tar.gz: ccbe9774d8f526ebbeed4b18ee170a3fc6ad9e4a
 SHA512:
-  metadata.gz: d66c31d78d2f144edd1b3b145ca0226968f9e52eb7e15fc332c8583287ae906f6c047c924e42b0f5ed6e84b78a46da7210df147667771d3027ad7b3d55091869
-  data.tar.gz: d3f62ce75db1290aa3eb6369d18dbcfec2c77b1f213777ad846b693b9032a27af584ed36cfc008e6bc386aaa82a52ca59c89bd15bc6af8d5aa483c03febb3bbb
+  metadata.gz: ff5e70b3ae70fa83bdefc3eff867582ec51bfe15ad61509e9340122c0ab965f11288c01f8dca01f07be317c482b0ac593f4470062951b8f4f6158de1d91a9371
+  data.tar.gz: 4f86e155a58580fd34b66e65e65a27a8715c7fc06c89ebec5e6c414d476c513b524f767c49e92c49d6c7beb02afe0f79595dc39b2465dfbaa51c7ce6b894d6d5

data/.gitignore

@@ -31,3 +31,4 @@ coverage/*
 Gemfile.lock
 .ruby-version
 .ruby-gemset
+pkg

data/.travis.yml

@@ -6,7 +6,9 @@ env:
   matrix:
     - SOLIDUS_BRANCH=v1.1 DB=postgres
     - SOLIDUS_BRANCH=v1.2 DB=postgres
+    - SOLIDUS_BRANCH=v1.3 DB=postgres
     - SOLIDUS_BRANCH=master DB=postgres
     - SOLIDUS_BRANCH=v1.1 DB=mysql
     - SOLIDUS_BRANCH=v1.2 DB=mysql
+    - SOLIDUS_BRANCH=v1.3 DB=mysql
     - SOLIDUS_BRANCH=master DB=mysql

data/README.md

@@ -61,12 +61,18 @@ You should see 'Stores & Domains' in Configuration tab of Spree Admin.
 Development
 -------
 
-To see if your stores indeed do point to the correct and unique domains, start your server with 
+To see if your stores indeed do point to the correct and unique domains, start your server with
 ```shell
 rails s -p 3000 -b lvh.me
 ```
 and give a store a domain like http://store1.lvh.me:3000/.
 
+If you'd like access to Solidus factories for your own tests that work well
+with this extension, add the following to your `spec_helper`:
+```ruby
+require "spree_multi_domain/testing_support/factory_overrides"
+```
+
 Authorization
 -------------
 

data/lib/spree_multi_domain/engine.rb

@@ -20,7 +20,7 @@ module SpreeMultiDomain
     initializer "templates with dynamic layouts" do |app|
       ActionView::TemplateRenderer.class_eval do
         def find_layout_with_multi_store(layout, locals)
-          if @view.respond_to?(:current_store) && @view.current_store && !@view.controller.is_a?(Spree::Admin::BaseController) && layout.call.present?
+          if @view.respond_to?(:current_store) && @view.current_store && !@view.controller.is_a?(Spree::Admin::BaseController)
             store_layout = if layout.is_a?(String)
                              layout.gsub("layouts/", "layouts/#{@view.current_store.code}/")
                            else

data/{spec/support → lib/spree_multi_domain/testing_support}/factory_overrides.rb

@@ -1,8 +1,8 @@
 FactoryGirl.modify do
   # Products need to belong to the same store as the order.
   factory :line_item do
-    before(:create) do |line_item, evaluator|
-      if line_item.order.store
+    after(:build) do |line_item, evaluator|
+      if line_item.order.store && line_item.product.stores.empty?
         line_item.product.stores << line_item.order.store
       end
     end

data/solidus_multi_domain.gemspec

@@ -3,7 +3,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = "solidus_multi_domain"
-  s.version     = "1.2.0"
+  s.version     = "1.3.0"
   s.summary     = "Adds multiple site support to Solidus"
   s.description = "Multiple Solidus stores on different domains - single unified backed for processing orders."
   s.required_ruby_version = ">= 2.1"

data/spec/lib/spree_multi_domain/testing_support/factory_overrides_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe "spree core factories should not raise ProductDoesNotBelongToStoreError" do
+  it "should be able to build a line_item" do
+    expect { build(:line_item) }.not_to raise_error
+  end
+
+  it "should be able to create a line_item" do
+    expect { create(:line_item) }.not_to raise_error
+  end
+
+  it "should be able to create a line_item with a specified variant" do
+    expect { create(:line_item, variant: create(:variant, price: 100.00)) }.not_to raise_error
+  end
+
+  it "should be able to build an inventory_unit" do
+    expect { build(:inventory_unit) }.not_to raise_error
+  end
+
+  it "should be able to create an inventory_unit" do
+    expect { create(:inventory_unit) }.not_to raise_error
+  end
+end

data/spec/requests/template_renderer_spec.rb

@@ -41,4 +41,30 @@ describe "Template renderer with dynamic layouts" do
       expect(response.body).to eq("Store layout just normal")
     end
   end
+
+  context "with an explicit `layout` passed to render" do
+    ExplicitLayoutController = Class.new(ApplicationController) do
+      def index
+        render :index, layout: 'fancy'
+      end
+    end
+
+    before do
+      ApplicationController.view_paths += [ActionView::FixtureResolver.new(
+          "layouts/fancy.html.erb"         => "Fancy <%= yield %>",
+          "explicit_layout/index.html.erb" => "explicit layout index"
+        )]
+      Rails.application.routes.draw do
+        get 'explicit_layout', to: 'explicit_layout#index'
+      end
+    end
+    it "should use explicit layout for unmatched store" do
+      get "http://www.example.com/explicit_layout"
+      expect(response.body).to eq("Fancy explicit layout index")
+    end
+    it "should use explicit layout for the current store" do
+      get "http://#{store.url}/explicit_layout"
+      expect(response.body).to eq("Fancy explicit layout index")
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -10,6 +10,7 @@ require 'ffaker'
 
 # Requires factories defined in spree_core
 require 'spree/testing_support/factories'
+require 'spree_multi_domain/testing_support/factory_overrides'
 require 'spree/testing_support/controller_requests'
 require 'spree/testing_support/authorization_helpers'
 require 'spree/testing_support/preferences'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_multi_domain
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-25 00:00:00.000000000 Z
+date: 2016-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus
@@ -221,6 +221,7 @@ files:
 - lib/spree/search/multi_domain.rb
 - lib/spree_multi_domain/engine.rb
 - lib/spree_multi_domain/multi_domain_helpers.rb
+- lib/spree_multi_domain/testing_support/factory_overrides.rb
 - solidus_multi_domain.gemspec
 - spec/controllers/spree/admin/products_controller_spec.rb
 - spec/controllers/spree/admin/stores_controller_spec.rb
@@ -229,6 +230,7 @@ files:
 - spec/controllers/spree/api/shipments_controller_spec.rb
 - spec/controllers/spree/products_controller_spec.rb
 - spec/helpers/products_helper_decorator_spec.rb
+- spec/lib/spree_multi_domain/testing_support/factory_overrides_spec.rb
 - spec/models/spree/line_item_spec.rb
 - spec/models/spree/order_spec.rb
 - spec/models/spree/permission_sets/store_display_spec.rb
@@ -241,7 +243,7 @@ files:
 - spec/requests/global_controller_helpers_spec.rb
 - spec/requests/template_renderer_spec.rb
 - spec/spec_helper.rb
-- spec/support/factory_overrides.rb
+- spec/support/.gitkeep
 homepage: https://solidus.io
 licenses:
 - BSD-3
@@ -275,6 +277,7 @@ test_files:
 - spec/controllers/spree/api/shipments_controller_spec.rb
 - spec/controllers/spree/products_controller_spec.rb
 - spec/helpers/products_helper_decorator_spec.rb
+- spec/lib/spree_multi_domain/testing_support/factory_overrides_spec.rb
 - spec/models/spree/line_item_spec.rb
 - spec/models/spree/order_spec.rb
 - spec/models/spree/permission_sets/store_display_spec.rb
@@ -287,4 +290,4 @@ test_files:
 - spec/requests/global_controller_helpers_spec.rb
 - spec/requests/template_renderer_spec.rb
 - spec/spec_helper.rb
-- spec/support/factory_overrides.rb
+- spec/support/.gitkeep