Merge pull request #130 from tnodland/model_cleanup

updates models with validates_inclusion_of to validate boolean attribute

.rspec

@@ -1,2 +1,3 @@
 --require spec_helper
 --format documentation
+--order=random

app/models/item.rb

@@ -6,6 +6,8 @@ class Item < ApplicationRecord
                         :current_price,
                         :merchant_id
 
+  validates_inclusion_of :enabled, in: [true, false]
+
   belongs_to :user, foreign_key: 'merchant_id'
   has_many :order_items
   has_many :orders, through: :order_items

app/models/order_item.rb

@@ -6,4 +6,6 @@ class OrderItem < ApplicationRecord
                         :item_id,
                         :quantity,
                         :ordered_price
+
+  validates_inclusion_of :fulfilled, in: [true, false]
 end

app/models/user.rb

@@ -7,8 +7,11 @@ class User < ApplicationRecord
                         :email,
                         :password,
                         :role
+
   validates_uniqueness_of :email
 
+  validates_inclusion_of :enabled, in: [true, false]
+
   has_many :orders
   has_many :items, foreign_key: "merchant_id"
 

spec/models/user_roles_spec.rb

@@ -3,20 +3,20 @@
 RSpec.describe User do
   describe 'roles' do
     it 'can create an admin' do
-      admin = create(:admin)
+      user = create(:admin)
 
       expect(user.role).to eq("admin")
       expect(user.admin?).to be_truthy
     end
 
     it 'can create a merchant' do
-      admin = create(:merchant)
+      user = create(:merchant)
 
       expect(user.role).to eq("merchant")
       expect(user.merchant?).to be_truthy
     end
     it 'can create an admin' do
-      admin = create(:user)
+      user = create(:user)
 
       expect(user.role).to eq("user")
       expect(user.user?).to be_truthy