spree_shipping_matrix 0.2.0 → 0.2.1

data/app/models/spree/shipping_matrix.rb

@@ -1,6 +1,6 @@
 module Spree
   class ShippingMatrix < ActiveRecord::Base
-    has_many :rules, ->{ order('min_line_item_total DESC') },
+    has_many :rules, -> { order('min_line_item_total DESC') },
                      class_name: Spree::ShippingMatrixRule,
                      inverse_of: :matrix
 

data/app/models/spree/shipping_matrix_rule.rb

@@ -33,7 +33,7 @@ module Spree
     end
 
     def matches_line_item_total?(info)
-      info[:line_item_total] > min_line_item_total
+      info[:line_item_total] >= min_line_item_total
     end
   end
 end

data/lib/generators/spree_shipping_matrix/install/install_generator.rb

@@ -1,7 +1,7 @@
 module SpreeShippingMatrix
   module Generators
     class InstallGenerator < Rails::Generators::Base
-      class_option :auto_run_migrations, :type => :boolean, :default => false
+      class_option :auto_run_migrations, type: :boolean, default: false
 
       def add_javascripts
         append_file 'vendor/assets/javascripts/spree/backend/all.js', "//= require spree/backend/spree_shipping_matrix\n"

data/lib/spree_shipping_matrix/engine.rb

@@ -9,7 +9,6 @@ module SpreeShippingMatrix
       g.test_framework :rspec
     end
 
-
     def self.activate
       Dir.glob(File.join(File.dirname(__FILE__), '../../app/**/*_decorator*.rb')) do |c|
         Rails.configuration.cache_classes ? require(c) : load(c)

data/lib/spree_shipping_matrix/version.rb

@@ -1,3 +1,3 @@
 module SpreeShippingMatrix
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/spec/features/shipping_matrix_checkout_spec.rb

@@ -2,34 +2,41 @@ feature 'Shipping Matrix in checkout flow' do
   before(:each) do
     given_there_are_many_spree_roles
     and_there_are_payment_methods_and_zones
-    and_there_is_1_shipping_matrix_with_num_of_rules(1)
+    and_there_is_1_shipping_matrix_with_rules [['entry', 26, '6.99'],
+                                               ['entry', 52, '5.99'],
+                                               ['vip', 26, '4.99'],
+                                               ['vip', 52, '3.00'],
+                                               ['ultra_vip', 26, '2.00'],
+                                               ['ultra_vip', 52, '1.00'],
+                                               ['press', 26, '0.00'],
+                                               ['press', 52, '0.00']]
     and_there_is_1_shipping_method_with_matrix_calculator
   end
 
-  [['entry', 26, '2.99'],
-   ['entry', 52, '0.00'],
-   ['vip', 26, '2.99'],
-   ['vip', 52, '0.00'],
-   ['ultra_vip', 26, '0.00'],
-   ['ultra_vip', 52, '0.00'],
+  [['entry', 26, '6.99'],
+   ['entry', 52, '5.99'],
+   ['vip', 26, '4.99'],
+   ['vip', 52, '3.00'],
+   ['ultra_vip', 26, '2.00'],
+   ['ultra_vip', 52, '1.00'],
    ['press', 26, '0.00'],
    ['press', 52, '0.00']].each do |role, order_value, price|
     scenario "Delivery price as #{role}" do
       given_i_am_logged_in_as_user_with(role)
-      when_i_have_reached_the_delivery_stage_of_checkout
-      and_my_basket_value_is(order_value)
+      when_my_basket_value_is(order_value)
+      and_i_have_reached_the_delivery_stage_of_checkout
       then_i_should_see_the_delivery_price_of(price)
     end
 
     scenario "Cheapest shipping method for #{role}" do
       given_i_am_logged_in_as_user_with(role)
-      when_there_is_more_than_one_shipping_method
-      and_my_basket_value_is(order_value)
+      when_my_basket_value_is(order_value)
+      and_there_is_more_than_one_shipping_method
       then_i_should_see_the_cheapest_delivery_price_of(price)
     end
   end
 
-  scenario "Free shipping method always wins" do
+  scenario 'Free shipping method always wins' do
     given_i_am_logged_in
     when_there_is_a_free_delivery_method
     then_the_delivery_should_be_free
@@ -45,12 +52,18 @@ end
 def and_there_are_payment_methods_and_zones
   FactoryGirl.create(:check_payment_method)
   country = FactoryGirl.create(:country)
-  Spree::Zone.global.members << Spree::ZoneMember.create(:zoneable => country)
-  country.states << FactoryGirl.create(:state, :country => country)
+  Spree::Zone.global.members << Spree::ZoneMember.create(zoneable: country)
+  country.states << FactoryGirl.create(:state, country: country)
 end
 
-def and_there_is_1_shipping_matrix_with_num_of_rules(num_of_rules)
- @matrix = create(:shipping_matrix_with_rules, num_of_rules: num_of_rules)
+def and_there_is_1_shipping_matrix_with_rules(rules)
+  @matrix = create(:shipping_matrix)
+
+  rules.each do |role, min_line_item_total, amount|
+    @matrix.rules.create(role: Spree::Role.find_by(name: role),
+                         min_line_item_total: min_line_item_total,
+                         amount: amount)
+  end
 end
 
 def and_there_is_1_shipping_method_with_matrix_calculator
@@ -58,24 +71,30 @@ def and_there_is_1_shipping_method_with_matrix_calculator
   create(:shipping_method, calculator: calc)
 end
 
-def when_i_have_reached_the_delivery_stage_of_checkout
-  order = OrderWalkthrough.up_to('delivery')
-  order.update(user_id: @user.id)
-  Spree::CheckoutController.any_instance.stub(:current_order => order)
+def when_my_basket_value_is(value)
+  @order = Spree::Order.create!(user: @user)
+  line_item = create(:line_item, price: value, order: @order)
+  line_item.variant.update!(price: value)
+  @order.reload
 end
 
-def and_my_basket_value_is(value)
-  Spree::LineItem.first.update(price: value)
+def and_i_have_reached_the_delivery_stage_of_checkout
+  @order.bill_address = FactoryGirl.create(:address, :country_id => Spree::Zone.global.members.first.zoneable.id)
+  @order.ship_address = FactoryGirl.create(:address, :country_id => Spree::Zone.global.members.first.zoneable.id)
+  @order.next!
+  @order.next!
+  Spree::CheckoutController.any_instance.stub(:current_order => @order)
 end
 
-def when_there_is_more_than_one_shipping_method
+def and_there_is_more_than_one_shipping_method
   create(:shipping_method)
-  when_i_have_reached_the_delivery_stage_of_checkout
+  and_i_have_reached_the_delivery_stage_of_checkout
 end
 
 def when_there_is_a_free_delivery_method
   create(:free_shipping_method)
-  when_i_have_reached_the_delivery_stage_of_checkout
+  when_my_basket_value_is(10)
+  and_i_have_reached_the_delivery_stage_of_checkout
 end
 
 def then_i_should_see_the_delivery_price_of(expected_delivery)

data/spec/spec_helper.rb

@@ -85,5 +85,5 @@ RSpec.configure do |config|
   end
 
   config.fail_fast = ENV['FAIL_FAST'] || false
-  config.order = "random"
+  config.order = 'random'
 end

data/spec/unit/models/shipping_matrix_rule_spec.rb

@@ -2,10 +2,12 @@ describe Spree::ShippingMatrixRule do
   context 'when created' do
     subject { described_class.create(attrs) }
 
-    let(:attrs) { { role: create(:role),
-                    min_line_item_total: 50,
-                    amount: 2.99,
-                    matrix: create(:shipping_matrix) } }
+    let(:attrs) do
+      { role: create(:role),
+        min_line_item_total: 50,
+        amount: 2.99,
+        matrix: create(:shipping_matrix) }
+    end
 
     context 'and all required parameters are provided' do
       it { is_expected.to be_valid }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_shipping_matrix
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-29 00:00:00.000000000 Z
+date: 2014-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -278,7 +278,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3748712467567725661
+      hash: -1089415386179746999
 requirements:
 - none
 rubyforge_project: