diff --git a/db/migrate/20150918175817_add_barcode_to_products.rb b/db/migrate/20150918175817_add_barcode_to_products.rb new file mode 100644 index 0000000..6952895 --- /dev/null +++ b/db/migrate/20150918175817_add_barcode_to_products.rb @@ -0,0 +1,5 @@ +class AddBarcodeToProducts < ActiveRecord::Migration + def change + add_column :products, :barcode, :string, null: false, default: "" + end +end diff --git a/spec/models/ability_spec.rb b/spec/models/ability_spec.rb index a0d2fdc..67473a6 100644 --- a/spec/models/ability_spec.rb +++ b/spec/models/ability_spec.rb @@ -21,7 +21,7 @@ describe User do it{ should_not be_able_to(:manage, Product.new) } it{ should be_able_to(:create, Order.new(user: user)) } - it{ should be_able_to(:delete, Order.new(user: user, created_at: Rails.application.config.call_api_after.minutes.ago)) } + it{ should be_able_to(:delete, Order.new(user: user, created_at: (Rails.application.config.call_api_after - 1.minutes).ago)) } it{ should_not be_able_to(:delete, Order.new(user: user, created_at: 10.minutes.ago)) } it{ should_not be_able_to(:manage, Order.new) }