Controller tests - Don't merge

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150127020039) do
+ActiveRecord::Schema.define(version: 20150127015409) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"

spec/controllers/users_controller_spec.rb

@@ -1,31 +1,44 @@
 RSpec.describe UsersController, :type => :controller do 
-
+
+  #INDEX
   describe "GET #index" do
     it "responds successfully with an HTTP 200 status code" do 
-        get :index
-        expect(response).to be_success
-        expect(response).to have_http_status(200)
-        end
+      get :index
+      expect(response).to be_success
+      expect(response).to have_http_status(200)
+    end
 
     it "renders the index template" do 
       get :index
       expect(response).to render_template("index")
     end 
   end
 
-  # describe "GET #show" do
-  #   it "assigns the requested user to @user" do
-  #     user = FactoryGirl.build(:a_user)
-  #     get :show, id: user
-  #     assigns(:user).should eq(user)
-  #   end
+  #SHOW
+  describe "GET #show" do
+    it "assigns the requested user to @user" do
+      user = FactoryGirl.create(:user)
+      get :show, id: user
+      expect(assigns(:user)).to eq(user)
+    end
 
-  #   it "renders the #show view" do
-  #     user = FactoryGirl.build(:a_user)
-  #     get :show, id: user
-  #     response.should render_template :show
-  #   end
+    it "renders the #show view" do
+      user = FactoryGirl.create(:user)
+      get :show, id: user
+      expect(response).to render_template :show
+    end
+  end
+
+  #NEW
+  describe "GET #new" do 
+    it "renders the new template" do
+      get :new
+      expect(response).to render_template("new")
+    end
+  end
 
-  # end
+  #CREATE
 
+    #EDIT
+    #UPDATE
 end

spec/factories/user_factory.rb

@@ -1,13 +1,14 @@
-FactoryGirl.define do 
-
+FactoryGirl.define do
+  sequence :email do |n|
+    "test#{n}@example.com"
+  end
 
 	#Creating an example user in this factory allows us to reference it in the rspec file
-	factory :a_user, class: User do
-
+	factory :user do
 		name "Dummy"
-		email "[email protected]"
-		password "dummy"
-
+		email 
+		password "dummy1234" 
+    # password has to be minimum 8 characters due to validation
 	end
 
 end

spec/support/factory_girl.rb

@@ -0,0 +1,12 @@
+RSpec.configure do |config|
+  config.include FactoryGirl::Syntax::Methods
+
+  config.before(:suite) do
+    begin
+      #DatabaseCleaner.start
+      FactoryGirl.lint
+    ensure
+      #DatabaseCleaner.clean
+    end
+  end
+end