Adds Character controller specs and Devise spec helpers

Author: Nejuf

app/controllers/characters_controller.rb

@@ -54,7 +54,7 @@ def create
           :portrait_image => portrait_image
         })
 
-        format.html { redirect_to @portrait, notice: 'Character was successfully created.' }
+        format.html { redirect_to @character, notice: 'Character was successfully created.' }
         format.json { render action: 'show', status: :created, location: @character }
       else
         format.html { render action: 'new' }

spec/controllers/characters_controller_spec.rb

@@ -20,15 +20,32 @@
 
 describe CharactersController do
 
+  login_user
+
   # This should return the minimal set of attributes required to create a valid
   # Character. As you add validations to Character, be sure to
   # adjust the attributes here as well.
-  let(:valid_attributes) { {  } }
+  let(:valid_attributes) do 
+    char = FactoryGirl.attributes_for(:character) 
+    char.delete :user_id
+    char.each do |k,v|
+      char[k] = v.to_s
+    end
+    char.stringify_keys
+  end
+  let(:new_attributes) do 
+    char = FactoryGirl.attributes_for(:character) 
+    char.delete :user_id
+    char.each do |k,v|
+      char[k] = v.to_s
+    end
+    char.stringify_keys
+  end
 
   # This should return the minimal set of values that should be in the session
   # in order to pass any filters (e.g. authentication) defined in
   # CharactersController. Be sure to keep this updated too.
-  let(:valid_session) { {} }
+  let(:valid_session) { session }
 
   describe "GET index" do
     it "assigns all characters as @characters" do
@@ -106,8 +123,8 @@
         # specifies that the Character created on the previous line
         # receives the :update_attributes message with whatever params are
         # submitted in the request.
-        Character.any_instance.should_receive(:update).with({ "these" => "params" })
-        put :update, {:id => character.to_param, :character => { "these" => "params" }}, valid_session
+        Character.any_instance.should_receive(:update).with(new_attributes)
+        put :update, {:id => character.to_param, :character => new_attributes}, valid_session
       end
 
       it "assigns the requested character as @character" do

spec/factories/users.rb

@@ -2,5 +2,7 @@
 
 FactoryGirl.define do
   factory :user do
+  	email { Faker::Internet.email }
+    password { "Password1234" }
   end
 end

spec/spec_helper.rb

@@ -40,4 +40,7 @@
   # the seed, which is printed after each run.
   #     --seed 1234
   config.order = "random"
+
+  config.include Devise::TestHelpers, :type => :controller
+  config.extend ControllerMacros, :type => :controller
 end

spec/support/controller_macros.rb

@@ -0,0 +1,18 @@
+module ControllerMacros
+  def login_admin
+    before(:each) do
+      @request.env["devise.mapping"] = Devise.mappings[:admin]
+      sign_in FactoryGirl.create(:admin) 
+    end
+  end
+
+  def login_user
+    before(:each) do
+      @request.env["devise.mapping"] = Devise.mappings[:user]
+      user = FactoryGirl.create(:user)
+      # user.confirm! # or set a confirmed_at inside the factory. Only necessary if you are using the confirmable module
+      #TODO enable user.confirm! once the confirmable module is being used (i.e. post-alpha)
+      sign_in user
+    end
+  end
+end