updates and model tests

Ada-C8 · marisamorris · Oct 17, 2017 · Oct 18, 2017 · Oct 18, 2017 · Oct 18, 2017
commit 8b8c7f9fb8388d33c67ed4c8bc9c12196a9ed9a8
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -2,7 +2,9 @@ class User < ApplicationRecord
   has_many :products
   has_many :orders
   has_many :reviews
+
   belongs_to :billing_datum, optional: true
+
   validates :username, presence: true
   validates :username, uniqueness: true
   validates :email, presence: true

diff --git a/db/seeds.rb b/db/seeds.rb
@@ -14,6 +14,8 @@
 #   movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }])
 #   Character.create(name: 'Luke', movie: movies.first)
 
+
+
 require 'csv'
 
 PRODUCT_FILE = Rails.root.join('db', 'seed_data', 'product_seeds.csv')

diff --git a/test/models/user_test.rb b/test/models/user_test.rb
@@ -1,9 +1,33 @@
 require "test_helper"
 
 describe User do
-  let(:user) { User.new }
+  # let(:user) { User.new }
+  let(:user) { users(:carl) }
 
-  it "must be valid" do
-    value(user).must_be :valid?
+  describe "User Model Validity" do
+
+    it "must be valid with username and email" do
+      value(user).must_be :valid?
+    end
+
+    it "Should return invalid without a username" do
+      user.valid?.must_equal true
+      user.username = nil
+      user.valid?.must_equal false
+    end
+
+    it "Should be invalid without an email" do
+      user.valid?.must_equal true
+      user.email = nil
+      user.valid?.must_equalfalse
+    end
+
+    it "Should not allow two users to have the same email" do
+      user.valid?.must_equal true
+      new_user = User.new(username: "Mr Magoo", email: "carl@carlcarle.me")
+
+      user.valid?.must_equal true
+      new_user.valid?.must_equal false
+    end
   end
 end