enju_circulation 0.1.2 → 0.2.0.beta.1

data/app/views/use_restrictions/index.html.erb

@@ -17,7 +17,7 @@
 <%- @use_restrictions.each do |use_restriction| -%>
   <tr class="line<%= cycle("0", "1") -%>">
     <td>
-      <%- if can? :update, use_restriction -%>
+      <%- if policy(use_restriction).update? -%>
         <%= move_position(use_restriction) -%>
       <%- end -%>
     </td>
@@ -28,10 +28,10 @@
       <%= use_restriction.note %>
     </td>
     <td>
-      <%- if can? :update, use_restriction -%>
+      <%- if policy(use_restriction).update? -%>
         <%= link_to t('page.edit'), edit_use_restriction_path(use_restriction) -%>
       <% end %>
-      <%- if can? :delete, use_restriction -%>
+      <%- if policy(use_restriction).destroy? -%>
         <%= link_to t('page.destroy'), use_restriction_path(use_restriction), data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <%- end -%>
     </td>
@@ -44,7 +44,7 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <%- if can? :create, UseRestriction -%>
+    <%- if policy(UseRestriction).create? -%>
       <li><%= link_to t('page.new', model: t('activerecord.models.use_restriction')), new_use_restriction_path -%></li>
     <%- end -%>
   </ul>

data/app/views/use_restrictions/show.html.erb

@@ -23,7 +23,7 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <%- if can? :update, @use_restriction -%>
+    <%- if policy(@use_restriction).update? -%>
       <li><%= link_to t('page.edit'), edit_use_restriction_path(@use_restriction) -%></li>
     <%- end -%>
     <li><%= back_to_index(flash[:page_info]) -%></li>

data/app/views/user_group_has_checkout_types/index.html.erb

@@ -15,10 +15,10 @@
     <td><%= link_to user_group_has_checkout_type.checkout_type.display_name.localize.localize, user_group_has_checkout_type.checkout_type -%></td>
     <td>
       <%= link_to t('page.show'), user_group_has_checkout_type -%>
-      <%- if can? :update, user_group_has_checkout_type -%>
+      <%- if policy(user_group_has_checkout_type).update? -%>
         <%= link_to t('page.edit'), edit_user_group_has_checkout_type_path(user_group_has_checkout_type) -%>
       <% end %>
-      <%- if can? :delete, user_group_has_checkout_type -%>
+      <%- if policy(user_group_has_checkout_type).destroy? -%>
         <%= link_to t('page.destroy'), user_group_has_checkout_type, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <% end %>
     </td>
@@ -31,7 +31,7 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <%- if can? :create, UserGroupHasCheckoutType -%>
+    <%- if policy(UserGroupHasCheckoutType).create? -%>
       <li><%= link_to t('page.new', model: t('activerecord.models.user_group_has_checkout_type')), new_user_group_has_checkout_type_path -%></li>
     <% end %>
   </ul>

data/app/views/user_group_has_checkout_types/show.html.erb

@@ -53,7 +53,7 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <% if can?(:update, @user_group_has_checkout_type) %>
+    <% if policy(@user_group_has_checkout_type).update? %>
       <li><%= link_to t('page.edit'), edit_user_group_has_checkout_type_path(@user_group_has_checkout_type) -%></li>
     <% end %>
     <li><%= back_to_index(flash[:page_info]) -%></li>

data/app/views/user_groups/_checkout_form.html.erb

@@ -1,21 +1,7 @@
 <div class="field">
   <%= f.label t('activerecord.models.user_group_has_checkout_type') %><br />
   <%= f.fields_for :user_group_has_checkout_types do |checkout_form| %>
-    <%= checkout_form.label :checkout_type_id -%>
-    <%= checkout_form.select(:checkout_type_id, @checkout_types.collect{|c| [c.display_name.localize, c.id]}) %>
-    <%= checkout_form.link_to_remove t('page.remove'), confirm: t('page.are_you_sure') %>
-    <br />
-    <%= checkout_form.label :checkout_limit -%>
-    <%= checkout_form.text_field :checkout_limit, class: 'resource_integer' %>
-    <%= checkout_form.label :checkout_period -%>
-    <%= checkout_form.text_field :checkout_period, class: 'resource_integer' %>
-    <%= checkout_form.label :checkout_renewal_limit -%>
-    <%= checkout_form.text_field :checkout_renewal_limit, class: 'resource_integer' %>
-    <br />
-    <%= checkout_form.label :reservation_limit -%>
-    <%= checkout_form.text_field :reservation_limit, class: 'resource_integer' %>
-    <%= checkout_form.label :set_due_date_before_closing_day -%>
-    <%= checkout_form.check_box :set_due_date_before_closing_day %>
+    <%= render 'user_group_has_checkout_type_fields', f: checkout_form %>
   <% end %>
-  <p><%= f.link_to_add t('page.add'), :user_group_has_checkout_types %></p>
+  <p><%= link_to_add_association t('page.add'), f, :user_group_has_checkout_types %></p>
 </div>

data/app/views/user_groups/_user_group_has_checkout_type_fields.html.erb

@@ -0,0 +1,14 @@
+<div class="nested-fields">
+  <%= f.label :checkout_limit -%>
+  <%= f.text_field :checkout_limit, class: 'resource_integer' %>
+  <%= f.label :checkout_period -%>
+  <%= f.text_field :checkout_period, class: 'resource_integer' %>
+  <%= f.label :checkout_renewal_limit -%>
+  <%= f.text_field :checkout_renewal_limit, class: 'resource_integer' %>
+  <br />
+  <%= f.label :reservation_limit -%>
+  <%= f.text_field :reservation_limit, class: 'resource_integer' %>
+  <%= f.label :set_due_date_before_closing_day -%>
+  <%= f.check_box :set_due_date_before_closing_day %>
+  <%= link_to_remove_association t('page.remove'), f, data: {confirm: t('page.are_you_sure')} %>
+</div>

data/db/migrate/20160703184619_add_most_recent_to_reserve_transitions.rb

@@ -0,0 +1,9 @@
+class AddMostRecentToReserveTransitions < ActiveRecord::Migration
+  def up
+    add_column :reserve_transitions, :most_recent, :boolean, null: true
+  end
+
+  def down
+    remove_column :reserve_transitions, :most_recent
+  end
+end

data/db/migrate/20160703184650_add_most_recent_to_manifestation_checkout_stat_transitions.rb

@@ -0,0 +1,9 @@
+class AddMostRecentToManifestationCheckoutStatTransitions < ActiveRecord::Migration
+  def up
+    add_column :manifestation_checkout_stat_transitions, :most_recent, :boolean, null: true
+  end
+
+  def down
+    remove_column :manifestation_checkout_stat_transitions, :most_recent
+  end
+end

data/db/migrate/20160703184723_add_most_recent_to_manifestation_reserve_stat_transitions.rb

@@ -0,0 +1,9 @@
+class AddMostRecentToManifestationReserveStatTransitions < ActiveRecord::Migration
+  def up
+    add_column :manifestation_reserve_stat_transitions, :most_recent, :boolean, null: true
+  end
+
+  def down
+    remove_column :manifestation_reserve_stat_transitions, :most_recent
+  end
+end

data/db/migrate/20160703184747_add_most_recent_to_user_checkout_stat_transitions.rb

@@ -0,0 +1,9 @@
+class AddMostRecentToUserCheckoutStatTransitions < ActiveRecord::Migration
+  def up
+    add_column :user_checkout_stat_transitions, :most_recent, :boolean, null: true
+  end
+
+  def down
+    remove_column :user_checkout_stat_transitions, :most_recent
+  end
+end

data/db/migrate/20160703184805_add_most_recent_to_user_reserve_stat_transitions.rb

@@ -0,0 +1,9 @@
+class AddMostRecentToUserReserveStatTransitions < ActiveRecord::Migration
+  def up
+    add_column :user_reserve_stat_transitions, :most_recent, :boolean, null: true
+  end
+
+  def down
+    remove_column :user_reserve_stat_transitions, :most_recent
+  end
+end

data/db/migrate/20160703190209_add_foreign_key_on_manifestation_id_to_reserve.rb

@@ -0,0 +1,5 @@
+class AddForeignKeyOnManifestationIdToReserve < ActiveRecord::Migration
+  def change
+    add_foreign_key :reserves, :manifestations
+  end
+end

data/lib/enju_circulation/version.rb

@@ -1,3 +1,3 @@
 module EnjuCirculation
-  VERSION = "0.1.2"
+  VERSION = "0.2.0.beta.1"
 end

data/lib/enju_circulation.rb

@@ -1,27 +1,7 @@
 require "enju_circulation/engine"
-require "enju_circulation/manifestation"
-require "enju_circulation/item"
-require "enju_circulation/user"
-require "enju_circulation/user_group"
-require "enju_circulation/profile"
-require "enju_circulation/accept"
-require "enju_circulation/basket"
-require "enju_circulation/carrier_type"
-require "enju_circulation/withdraw"
-require "enju_circulation/controller"
 require "enju_circulation/helper"
 
 module EnjuCirculation
 end
 
-ActionController::Base.send :include, EnjuCirculation::Controller
-ActiveRecord::Base.send :include, EnjuCirculation::EnjuManifestation
-ActiveRecord::Base.send :include, EnjuCirculation::EnjuItem
-ActiveRecord::Base.send :include, EnjuCirculation::EnjuUser
-ActiveRecord::Base.send :include, EnjuCirculation::EnjuUserGroup
-ActiveRecord::Base.send :include, EnjuCirculation::EnjuProfile
-ActiveRecord::Base.send :include, EnjuCirculation::EnjuAccept
-ActiveRecord::Base.send :include, EnjuCirculation::EnjuBasket
-ActiveRecord::Base.send :include, EnjuCirculation::EnjuCarrierType
-ActiveRecord::Base.send :include, EnjuCirculation::EnjuWithdraw
 ActionView::Base.send :include, EnjuCirculation::ManifestationsHelper

data/lib/generators/enju_circulation/setup/setup_generator.rb

@@ -10,10 +10,22 @@ class EnjuCirculation::SetupGenerator < Rails::Generators::Base
     rake("enju_message_engine:install:migrations")
     generate("enju_event:setup")
     generate("enju_message:setup")
-    inject_into_file 'app/controllers/application_controller.rb',
-      "  enju_circulation\n", :after => "enju_library\n"
-    inject_into_file 'app/models/user.rb',
-      "  enju_circulation_user_model\n", :after => "enju_leaf_user_model\n"
+    inject_into_class "app/controllers/application_controller.rb", ApplicationController do
+      "  include EnjuCirculation::Controller\n"
+    end
+    inject_into_class 'app/models/user.rb', User do
+      "  include EnjuCirculation::EnjuUser\n"
+    end
+    append_to_file "config/initializers/enju_leaf.rb", <<EOS
+Accept.include(EnjuCirculation::EnjuAccept)
+Basket.include(EnjuCirculation::EnjuBasket)
+CarrierType.include(EnjuCirculation::EnjuCarrierType)
+Manifestation.include(EnjuCirculation::EnjuManifestation)
+Item.include(EnjuCirculation::EnjuItem)
+Profile.include(EnjuCirculation::EnjuProfile)
+UserGroup.include(EnjuCirculation::EnjuUserGroup)
+Withdraw.include(EnjuCirculation::EnjuWithdraw)
+EOS
     append_to_file("config/schedule.rb", File.open(File.expand_path('../templates', __FILE__) + '/config/schedule.rb').read)
     append_to_file 'config/initializers/inflections.rb',  <<EOS
 ActiveSupport::Inflector.inflections do |inflect|

data/lib/tasks/enju_circulation_tasks.rake

@@ -8,7 +8,7 @@ namespace :enju_circulation do
   desc "create initial records for enju_circulation"
   task :setup => :environment do
     Dir.glob(Rails.root.to_s + '/db/fixtures/enju_circulation/*.yml').each do |file|
-      ActiveRecord::Fixtures.create_fixtures('db/fixtures/enju_circulation', File.basename(file, '.*'))
+      ActiveRecord::FixtureSet.create_fixtures('db/fixtures/enju_circulation', File.basename(file, '.*'))
     end
 
     Rake::Task['enju_event:setup'].invoke

data/spec/controllers/carrier_type_has_checkout_types_controller_spec.rb

@@ -13,7 +13,7 @@ describe CarrierTypeHasCheckoutTypesController do
 
       it "assigns all carrier_type_has_checkout_types as @carrier_type_has_checkout_types" do
         get :index
-        assigns(:carrier_type_has_checkout_types).should eq(CarrierTypeHasCheckoutType.all)
+        assigns(:carrier_type_has_checkout_types).should eq(CarrierTypeHasCheckoutType.page(1))
       end
     end
 
@@ -22,7 +22,7 @@ describe CarrierTypeHasCheckoutTypesController do
 
       it "assigns all carrier_type_has_checkout_types as @carrier_type_has_checkout_types" do
         get :index
-        assigns(:carrier_type_has_checkout_types).should eq(CarrierTypeHasCheckoutType.all)
+        assigns(:carrier_type_has_checkout_types).should eq(CarrierTypeHasCheckoutType.page(1))
       end
     end
 
@@ -31,7 +31,7 @@ describe CarrierTypeHasCheckoutTypesController do
 
       it "assigns all carrier_type_has_checkout_types as @carrier_type_has_checkout_types" do
         get :index
-        assigns(:carrier_type_has_checkout_types).should be_empty
+        assigns(:carrier_type_has_checkout_types).should be_nil
         response.should be_forbidden
       end
     end
@@ -39,7 +39,7 @@ describe CarrierTypeHasCheckoutTypesController do
     describe "When not logged in" do
       it "assigns all carrier_type_has_checkout_types as @carrier_type_has_checkout_types" do
         get :index
-        assigns(:carrier_type_has_checkout_types).should be_empty
+        assigns(:carrier_type_has_checkout_types).should be_nil
         response.should redirect_to(new_user_session_url)
       end
     end
@@ -101,7 +101,7 @@ describe CarrierTypeHasCheckoutTypesController do
 
       it "should not assign the requested carrier_type_has_checkout_type as @carrier_type_has_checkout_type" do
         get :new
-        assigns(:carrier_type_has_checkout_type).should_not be_valid
+        assigns(:carrier_type_has_checkout_type).should be_nil
         response.should be_forbidden
       end
     end
@@ -111,7 +111,7 @@ describe CarrierTypeHasCheckoutTypesController do
 
       it "should not assign the requested carrier_type_has_checkout_type as @carrier_type_has_checkout_type" do
         get :new
-        assigns(:carrier_type_has_checkout_type).should_not be_valid
+        assigns(:carrier_type_has_checkout_type).should be_nil
         response.should be_forbidden
       end
     end
@@ -119,7 +119,7 @@ describe CarrierTypeHasCheckoutTypesController do
     describe "When not logged in" do
       it "should not assign the requested carrier_type_has_checkout_type as @carrier_type_has_checkout_type" do
         get :new
-        assigns(:carrier_type_has_checkout_type).should_not be_valid
+        assigns(:carrier_type_has_checkout_type).should be_nil
         response.should redirect_to(new_user_session_url)
       end
     end
@@ -205,7 +205,7 @@ describe CarrierTypeHasCheckoutTypesController do
       describe "with valid params" do
         it "assigns a newly created carrier_type_has_checkout_type as @carrier_type_has_checkout_type" do
           post :create, :carrier_type_has_checkout_type => @attrs
-          assigns(:carrier_type_has_checkout_type).should be_valid
+          assigns(:carrier_type_has_checkout_type).should be_nil
         end
 
         it "should be forbidden" do
@@ -217,7 +217,7 @@ describe CarrierTypeHasCheckoutTypesController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved carrier_type_has_checkout_type as @carrier_type_has_checkout_type" do
           post :create, :carrier_type_has_checkout_type => @invalid_attrs
-          assigns(:carrier_type_has_checkout_type).should_not be_valid
+          assigns(:carrier_type_has_checkout_type).should be_nil
         end
 
         it "should be forbidden" do
@@ -233,7 +233,7 @@ describe CarrierTypeHasCheckoutTypesController do
       describe "with valid params" do
         it "assigns a newly created carrier_type_has_checkout_type as @carrier_type_has_checkout_type" do
           post :create, :carrier_type_has_checkout_type => @attrs
-          assigns(:carrier_type_has_checkout_type).should be_valid
+          assigns(:carrier_type_has_checkout_type).should be_nil
         end
 
         it "should be forbidden" do
@@ -245,7 +245,7 @@ describe CarrierTypeHasCheckoutTypesController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved carrier_type_has_checkout_type as @carrier_type_has_checkout_type" do
           post :create, :carrier_type_has_checkout_type => @invalid_attrs
-          assigns(:carrier_type_has_checkout_type).should_not be_valid
+          assigns(:carrier_type_has_checkout_type).should be_nil
         end
 
         it "should be forbidden" do
@@ -259,7 +259,7 @@ describe CarrierTypeHasCheckoutTypesController do
       describe "with valid params" do
         it "assigns a newly created carrier_type_has_checkout_type as @carrier_type_has_checkout_type" do
           post :create, :carrier_type_has_checkout_type => @attrs
-          assigns(:carrier_type_has_checkout_type).should be_valid
+          assigns(:carrier_type_has_checkout_type).should be_nil
         end
 
         it "should be forbidden" do
@@ -271,7 +271,7 @@ describe CarrierTypeHasCheckoutTypesController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved carrier_type_has_checkout_type as @carrier_type_has_checkout_type" do
           post :create, :carrier_type_has_checkout_type => @invalid_attrs
-          assigns(:carrier_type_has_checkout_type).should_not be_valid
+          assigns(:carrier_type_has_checkout_type).should be_nil
         end
 
         it "should be forbidden" do

data/spec/controllers/checked_items_controller_spec.rb

@@ -43,7 +43,7 @@ describe CheckedItemsController do
 
       it "assigns empty as @checked_items" do
         get :index
-        assigns(:checked_items).should be_empty
+        assigns(:checked_items).should be_nil
         response.should be_forbidden
       end
 
@@ -56,13 +56,13 @@ describe CheckedItemsController do
     describe "When not logged in" do
       it "assigns empty as @checked_items" do
         get :index
-        assigns(:checked_items).should be_empty
+        assigns(:checked_items).should be_nil
         response.should redirect_to(new_user_session_url)
       end
 
       it "should not get index with basket_id and item_id" do
         get :index, :basket_id => 1, :item_id => 1
-        assigns(:checked_items).should be_empty
+        assigns(:checked_items).should be_nil
         response.should redirect_to(new_user_session_url)
       end
     end
@@ -140,7 +140,7 @@ describe CheckedItemsController do
 
       it "should not assign the requested checked_item as @checked_item" do
         get :new, :basket_id => 3
-        assigns(:checked_item).should_not be_valid
+        assigns(:checked_item).should be_nil
         response.should be_forbidden
       end
     end
@@ -148,7 +148,7 @@ describe CheckedItemsController do
     describe "When not logged in" do
       it "should not assign the requested checked_item as @checked_item" do
         get :new, :basket_id => 3
-        assigns(:checked_item).should_not be_valid
+        assigns(:checked_item).should be_nil
         response.should redirect_to(new_user_session_url)
       end
     end
@@ -356,7 +356,7 @@ describe CheckedItemsController do
     end
 
     describe "When not logged in" do
-      it "should not update checed_item" do
+      it "should not update checked_item" do
         put :update, :id => 1, :checked_item => { }, :basket_id => 1
         response.should redirect_to new_user_session_url
       end

data/spec/controllers/checkins_controller_spec.rb

@@ -123,7 +123,7 @@ describe CheckinsController do
 
       it "should not assign the requested checkin as @checkin" do
         get :new
-        assigns(:checkin).should_not be_valid
+        assigns(:checkin).should be_nil
         response.should be_forbidden
       end
     end
@@ -131,7 +131,7 @@ describe CheckinsController do
     describe "When not logged in" do
       it "should not assign the requested checkin as @checkin" do
         get :new
-        assigns(:checkin).should_not be_valid
+        assigns(:checkin).should be_nil
         response.should redirect_to(new_user_session_url)
       end
     end
@@ -189,7 +189,7 @@ describe CheckinsController do
       describe "with valid params" do
         it "assigns a newly created checkin as @checkin" do
           post :create, :checkin => @attrs
-          assigns(:checkin).should_not be_valid
+          assigns(:checkin).should be_nil
         end
 
         it "should not create checkin without basket_id" do
@@ -216,7 +216,7 @@ describe CheckinsController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved checkin as @checkin" do
           post :create, :checkin => @invalid_attrs
-          assigns(:checkin).should_not be_valid
+          assigns(:checkin).should be_nil
         end
 
         it "should be forbidden" do
@@ -238,7 +238,7 @@ describe CheckinsController do
       describe "with valid params" do
         it "assigns a newly created checkin as @checkin" do
           post :create, :checkin => @attrs
-          assigns(:checkin).should_not be_valid
+          assigns(:checkin).should be_nil
         end
 
         it "should not create checkin without basket_id" do
@@ -277,7 +277,7 @@ describe CheckinsController do
       describe "with valid params" do
         it "assigns a newly created checkin as @checkin" do
           post :create, :checkin => @attrs
-          assigns(:checkin).should_not be_valid
+          assigns(:checkin).should be_nil
         end
 
         it "should be forbidden" do

data/spec/controllers/checkout_types_controller_spec.rb

@@ -31,7 +31,7 @@ describe CheckoutTypesController do
 
       it "assigns all checkout_types as @checkout_types" do
         get :index
-        assigns(:checkout_types).should be_empty
+        assigns(:checkout_types).should be_nil
         response.should be_forbidden
       end
     end
@@ -39,7 +39,7 @@ describe CheckoutTypesController do
     describe "When not logged in" do
       it "assigns all checkout_types as @checkout_types" do
         get :index
-        assigns(:checkout_types).should be_empty
+        assigns(:checkout_types).should be_nil
         response.should redirect_to(new_user_session_url)
       end
     end
@@ -101,7 +101,7 @@ describe CheckoutTypesController do
 
       it "should not assign the requested checkout_type as @checkout_type" do
         get :new
-        assigns(:checkout_type).should_not be_valid
+        assigns(:checkout_type).should be_nil
         response.should be_forbidden
       end
     end
@@ -111,7 +111,7 @@ describe CheckoutTypesController do
 
       it "should not assign the requested checkout_type as @checkout_type" do
         get :new
-        assigns(:checkout_type).should_not be_valid
+        assigns(:checkout_type).should be_nil
         response.should be_forbidden
       end
     end
@@ -119,7 +119,7 @@ describe CheckoutTypesController do
     describe "When not logged in" do
       it "should not assign the requested checkout_type as @checkout_type" do
         get :new
-        assigns(:checkout_type).should_not be_valid
+        assigns(:checkout_type).should be_nil
         response.should redirect_to(new_user_session_url)
       end
     end
@@ -205,7 +205,7 @@ describe CheckoutTypesController do
       describe "with valid params" do
         it "assigns a newly created checkout_type as @checkout_type" do
           post :create, :checkout_type => @attrs
-          assigns(:checkout_type).should be_valid
+          assigns(:checkout_type).should be_nil
         end
 
         it "should be forbidden" do
@@ -217,7 +217,7 @@ describe CheckoutTypesController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved checkout_type as @checkout_type" do
           post :create, :checkout_type => @invalid_attrs
-          assigns(:checkout_type).should_not be_valid
+          assigns(:checkout_type).should be_nil
         end
 
         it "should be forbidden" do
@@ -233,7 +233,7 @@ describe CheckoutTypesController do
       describe "with valid params" do
         it "assigns a newly created checkout_type as @checkout_type" do
           post :create, :checkout_type => @attrs
-          assigns(:checkout_type).should be_valid
+          assigns(:checkout_type).should be_nil
         end
 
         it "should be forbidden" do
@@ -245,7 +245,7 @@ describe CheckoutTypesController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved checkout_type as @checkout_type" do
           post :create, :checkout_type => @invalid_attrs
-          assigns(:checkout_type).should_not be_valid
+          assigns(:checkout_type).should be_nil
         end
 
         it "should be forbidden" do
@@ -259,7 +259,7 @@ describe CheckoutTypesController do
       describe "with valid params" do
         it "assigns a newly created checkout_type as @checkout_type" do
           post :create, :checkout_type => @attrs
-          assigns(:checkout_type).should be_valid
+          assigns(:checkout_type).should be_nil
         end
 
         it "should be forbidden" do
@@ -271,7 +271,7 @@ describe CheckoutTypesController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved checkout_type as @checkout_type" do
           post :create, :checkout_type => @invalid_attrs
-          assigns(:checkout_type).should_not be_valid
+          assigns(:checkout_type).should be_nil
         end
 
         it "should be forbidden" do