shop_bunny 0.8.6 → 0.8.8

data/spec/models/cart_spec.rb

@@ -51,21 +51,18 @@ describe Cart do
     end
 
     describe "adding coupons using #coupons<<" do
-      it "adds a coupon though CouponUse" do
+      it "adds a coupon" do
         coupon = Coupon.make
-        add_a_coupon = lambda {
+        expect {
           @cart.coupons << coupon
-        }
-        add_a_coupon.should change { @cart.coupons.count }.by(1)
-        add_a_coupon.should change { CouponUse.count }.by(1)
+        }.to change { @cart.coupons.count }.by(1)
       end
 
-      it "adds a Coupon only once" do
+      it "creates a CouponUse" do
         coupon = Coupon.make
-        lambda {
-          @cart.coupons << coupon
+        expect {
           @cart.coupons << coupon
-        }.should change { @cart.coupons.count }.by(1)
+        }.to change { CouponUse.count }.by(1)
       end
     end
 
@@ -134,9 +131,9 @@ describe Cart do
       end
 
       it "with max_uses=1 via coupon_code= should not invalidate the cart" do
-        coupon = Coupon.make(:max_uses => 1)
+        coupon = Coupon.make(:max_uses => 1, :state => "active")
         @cart.coupon_code = coupon.code
-        @cart.save!
+        @cart.save
         @cart.should be_valid
       end
 
@@ -155,19 +152,12 @@ describe Cart do
         @cart.coupons.should be_empty
         @cart.save
         @cart.reload
-        
         @cart.coupons.should include coupon
         @cart.coupons.size.should == 1
-        
-        @cart.coupon_code = ""
-        @cart.save
-        @cart.reload
-        
-        @cart.coupons.size.should == 1
+
         @cart.coupon_code = coupon.code
         @cart.save
         @cart.reload
-
         @cart.coupons.size.should == 1
       end
 
@@ -182,6 +172,7 @@ describe Cart do
         @cart.coupons.size.should == 0
       end
     end
+
     context "with bonusarticle" do
       before do
         @item = Item.make

data/spec/models/shop_bunny/coupon_use_spec.rb

@@ -2,5 +2,14 @@ require 'spec_helper'
 
 describe ShopBunny::CouponUse do
   it { should validate_presence_of :cart_id }
-  it { should validate_presence_of :coupon_id }  
+  it { should validate_presence_of :coupon_id }
+
+  it "validates uniqueness of the cart and coupon tuple" do
+    cart = Cart.make
+    coupon = ShopBunny::Coupon.make
+    ShopBunny::CouponUse.create!(:coupon => coupon, :cart => cart)
+    expect {
+      ShopBunny::CouponUse.create!(:coupon => coupon, :cart => cart)
+    }.to raise_error(ActiveRecord::RecordInvalid)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shop_bunny
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.8.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-01 00:00:00.000000000Z
+date: 2012-03-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &17930880 !ruby/object:Gem::Requirement
+  requirement: &21969160 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *17930880
+  version_requirements: *21969160
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &17895000 !ruby/object:Gem::Requirement
+  requirement: &21963860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17895000
+  version_requirements: *21963860
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &17894420 !ruby/object:Gem::Requirement
+  requirement: &21959860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17894420
+  version_requirements: *21959860
 - !ruby/object:Gem::Dependency
   name: machinist
-  requirement: &17893900 !ruby/object:Gem::Requirement
+  requirement: &21959440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17893900
+  version_requirements: *21959440
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &17893480 !ruby/object:Gem::Requirement
+  requirement: &21958980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17893480
+  version_requirements: *21958980
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
-  requirement: &17892960 !ruby/object:Gem::Requirement
+  requirement: &21958340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17892960
+  version_requirements: *21958340
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &17892420 !ruby/object:Gem::Requirement
+  requirement: &21957600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17892420
+  version_requirements: *21957600
 description: A simple shop gem that integrates a cart and coupons functionality
 email:
 - jan@kopfmaschine.com
@@ -105,6 +105,7 @@ files:
 - config/locales/shop_bunny.en.yml
 - db/test.sqlite3
 - db/development.sqlite3
+- db/migrate/20120315145137_index_to_coupon_use_coupon_id_and_cart_id.rb
 - db/migrate/20100915162029_remove_owner_id_from_carts.rb
 - db/migrate/20110821124655_add_max_uses_to_coupon.rb
 - db/migrate/20101125140137_add_value_of_automatic_add_to_coupons.rb
@@ -135,8 +136,12 @@ files:
 - spec/controllers/shop_bunny/carts_controller_spec.rb
 - spec/requests/shop_bunny/shopping_spec.rb
 - spec/spec_helper.rb
+- spec/dummy/db/test.sqlite3
+- spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/20100915073016_create_items.rb
 - spec/dummy/db/schema.rb
+- spec/dummy/log/development.log
+- spec/dummy/log/test.log
 - spec/dummy/script/rails
 - spec/dummy/config.ru
 - spec/dummy/Rakefile
@@ -203,8 +208,12 @@ test_files:
 - spec/controllers/shop_bunny/carts_controller_spec.rb
 - spec/requests/shop_bunny/shopping_spec.rb
 - spec/spec_helper.rb
+- spec/dummy/db/test.sqlite3
+- spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/20100915073016_create_items.rb
 - spec/dummy/db/schema.rb
+- spec/dummy/log/development.log
+- spec/dummy/log/test.log
 - spec/dummy/script/rails
 - spec/dummy/config.ru
 - spec/dummy/Rakefile