solidus_multi_domain 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62d8d93fb78e41df98961c5facc8ab53417b26ed
-  data.tar.gz: ab6e798427dd7e4a97d24208a0aa0e4355d817c7
+  metadata.gz: 6efd8a195f9ef9cce20361a7fda8a8a97a32d769
+  data.tar.gz: ee4102db3fbc47787f5d4446a92d1ac53d73a8af
 SHA512:
-  metadata.gz: 5f2bd59b62385a6b435b39238db873295ac54403dc373c25ce5b342297ad9c26d76224c9952832d62c0cffc9716df8926002e0dcf72308957e276262d18ebe96
-  data.tar.gz: dcd46d85d0f7850db4b465e7b2d037e7ede7f3a5a3766eb45bd810b738e68e9545fdfabaf0d9de1bfab9b88953c59e1358c6923d548afdeffe4a61346898a47e
+  metadata.gz: 8a9f833abc9d7bbd3f5c22281093d773305e1a19e6c68ff9c9d15adaf68c8832803f3c328c18ea6a360309c84cb3bd22bcd12b31ae6e782c76b78efa4bf06d78
+  data.tar.gz: 76e9eca1a23e3c0e96fc2eb4a56357c26cad4b97fe3e7f518735c05b5ad36fdca6a1fca8b14901e139b0a9c91ac34beaf78ce2f20f6dc1b8795cf14203fd1224

data/lib/assets/javascripts/spree/backend/store_picker.js

@@ -4,7 +4,7 @@ $.fn.storeAutocomplete = function() {
     multiple: true,
     initSelection: function(element, callback) {
       $.get(Spree.routes.store_search, { ids: element.val() }, function(data) {
-        callback(data.stores)
+        callback(data)
       })
     },
     ajax: {
@@ -14,7 +14,7 @@ $.fn.storeAutocomplete = function() {
         return { q: term }
       },
       results: function(data, page) {
-        return { results: data.stores }
+        return { results: data }
       }
     },
     formatResult: function(store) {
@@ -28,7 +28,3 @@ $.fn.storeAutocomplete = function() {
     }
   });
 }
-
-$(document).ready(function () {
-  $('.store_picker').storeAutocomplete();
-})

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.4.1"
+  s.version     = "1.4.2"
   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"
@@ -28,5 +28,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency "coffee-rails"
   s.add_development_dependency "factory_girl", "~> 4.5"
   s.add_development_dependency "capybara"
+  s.add_development_dependency "poltergeist"
+  s.add_development_dependency "capybara-screenshot"
+  s.add_development_dependency "database_cleaner"
   s.add_development_dependency "ffaker"
 end

data/spec/features/admin/promotion_rule_store_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+RSpec.describe "Store promotion rule", js: true do
+  stub_authorization!
+
+  let!(:store) { create(:store, name: "Real fake doors") }
+  let!(:promotion) { create(:promotion) }
+
+  it "Can add a store rule to a promotion" do
+    visit spree.edit_admin_promotion_path(promotion)
+
+    select2 "Store", from: "Add rule of type"
+    within("#rules_container") { click_button "Add" }
+
+    select2_search store.name, from: "Choose Stores"
+
+    within("#rules_container") { click_button "Update" }
+    expect(page).to have_content('successfully updated')
+  end
+end

data/spec/spec_helper.rb

@@ -8,15 +8,25 @@ require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 require 'rspec/rails'
 require 'ffaker'
 
+require 'database_cleaner'
+require 'capybara/rspec'
+require 'capybara-screenshot/rspec'
+require 'capybara/poltergeist'
+Capybara.register_driver(:poltergeist) do |app|
+  Capybara::Poltergeist::Driver.new app, timeout: 90
+end
+Capybara.javascript_driver = :poltergeist
+Capybara.default_max_wait_time = 10
+
 # 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'
-
 require 'spree/api/testing_support/helpers'
 require 'spree/api/testing_support/setup'
+require 'spree/testing_support/capybara_ext'
 
 require 'cancan/matchers'
 
@@ -28,9 +38,22 @@ RSpec.configure do |config|
 
   config.filter_run focus: true
   config.run_all_when_everything_filtered = true
-  config.use_transactional_fixtures = true
+  config.use_transactional_fixtures = false
 
   config.include FactoryGirl::Syntax::Methods
   config.include Spree::TestingSupport::ControllerRequests, type: :controller
   config.include Spree::Api::TestingSupport::Helpers, type: :controller
+
+  config.before :suite do
+    DatabaseCleaner.clean_with :truncation
+  end
+
+  config.before do
+    DatabaseCleaner.strategy = RSpec.current_example.metadata[:js] ? :truncation : :transaction
+    DatabaseCleaner.start
+  end
+
+  config.after do
+    DatabaseCleaner.clean
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_multi_domain
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-13 00:00:00.000000000 Z
+date: 2016-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus
@@ -136,6 +136,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: poltergeist
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: capybara-screenshot
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ffaker
   requirement: !ruby/object:Gem::Requirement
@@ -242,6 +284,7 @@ files:
 - spec/controllers/spree/api/products_controller_spec.rb
 - spec/controllers/spree/api/shipments_controller_spec.rb
 - spec/controllers/spree/products_controller_spec.rb
+- spec/features/admin/promotion_rule_store_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
@@ -289,6 +332,7 @@ test_files:
 - spec/controllers/spree/api/products_controller_spec.rb
 - spec/controllers/spree/api/shipments_controller_spec.rb
 - spec/controllers/spree/products_controller_spec.rb
+- spec/features/admin/promotion_rule_store_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