validation tests added and passing

app/controllers/users_controller.rb

@@ -1,7 +1,40 @@
 class UsersController < ApplicationController
 
+  def index
+    @users = User.all
+  end
+
+  def show
+    user_id = params[:id]
+    @user = User.find_by(id: user_id)
+    if @user.nil?
+      # Change this to a 404 page
+      redirect_to root
+    end
+  end
+
+  def new
+    @user = User.new
+  end
+
+  def create
+    @user = User.new(user_params)
+    if @user.save
+      flash[:success] = "You have joined the ranker!"
+      # @user or @user.id ?
+      redirect_to user_path(@user.id)
+      return
+    else
+      flash.now[:error] = "There's been an error. We couldn't add you to the system."
+      render :new, status: :bad_request
+      return
+    end
+  end
 
   private
 
-  # Strong Params: https://learn-2.galvanize.com/cohorts/2036/blocks/1006/content_files/intro-to-rails/strong-params.md
+  def user_params
+    return params.require(:user).permit(:user_name, :join_date)
+  end
+
 end

app/controllers/works_controller.rb

@@ -1,12 +1,9 @@
 class WorksController < ApplicationController
+
   def index
     @works = Work.all
   end
 
-  def new
-    @work = Work.new
-  end
-
   def show
     work_id = params[:id]
     @work = Work.find_by(id: work_id)
@@ -16,8 +13,27 @@ def show
     end
   end
 
+  def new
+    @work = Work.new
+  end
+
+  def create
+    @work = Work.new(work_params)
+    if @work.save # returns true if db insert succeeds
+      flash[:success] = "Your #{@work.category} has been added successfully to the ranker"
+      redirect_to work_path(@work.id) # @work or @work.id?
+      return
+    else
+      flash.now[:error] = "Something's gone awry. Your #{@work.category} hasn't been added"
+      render :new, status: :bad_request # look at bad_request
+      return
+    end
+  end
+
   private
 
-  # Strong Params: https://learn-2.galvanize.com/cohorts/2036/blocks/1006/content_files/intro-to-rails/strong-params.md
+  def work_params
+    return params.require(:work).permit(:title, :category, :creator, :publication_year, :description)
+  end
 
 end

app/models/user.rb

@@ -2,6 +2,4 @@ class User < ApplicationRecord
   has_many :votes
 
   validates :user_name, presence: true
-  validates :category, presence: true
-  validates :creator, presence: true
 end

app/models/work.rb

@@ -2,4 +2,5 @@ class Work < ApplicationRecord
   has_many :votes
 
   validates :title, presence: true
+  validates :category, presence: true
 end

test/models/user_test.rb

@@ -1,7 +1,30 @@
 require "test_helper"
 
+# Add Relations Tests in Wave 2
+# Add Fixtures Later
+# New? Create?
+
 describe User do
-  # it "does a thing" do
-  #   value(1+1).must_equal 2
-  # end
+  it "is valid when all required fields are present" do
+    # Arrange
+    @user = User.new(user_name: "me")
+
+    # Act
+    created_user = @user.valid?
+
+    # Assert
+    expect(created_user).must_equal true
+  end
+
+  it "is invalid without title" do
+    # Arrange
+    @user = User.new
+
+    #Act
+    created_user = @user.valid?
+
+    # Assert
+    expect(created_user).must_equal false
+    expect(@user.errors.messages).must_include :user_name
+  end
 end

test/models/work_test.rb

@@ -1,7 +1,42 @@
 require "test_helper"
 
+# Add Relations Tests in Wave 2
+# Add Fixtures Later
+# New? Create?
+
 describe Work do
-  # it "does a thing" do
-  #   value(1+1).must_equal 2
-  # end
+  it "is valid when all required fields are present" do
+    # Arrange
+    @work = Work.new(title: "Long", category: "Movie")
+
+    # Act
+    created_work = @work.valid?
+
+    # Assert
+    expect(created_work).must_equal true
+  end
+
+  it "is invalid without title" do
+    # Arrange
+    @work = Work.new(category: "Movie")
+
+    #Act
+    created_work = @work.valid?
+
+    # Assert
+    expect(created_work).must_equal false
+    expect(@work.errors.messages).must_include :title
+  end
+
+  it "is invalid without category" do
+    # Arrange
+    @work = Work.new(title: "Long")
+
+    #Act
+    created_work = @work.valid?
+
+    # Assert
+    expect(created_work).must_equal false
+    expect(@work.errors.messages).must_include :category
+  end
 end