Merge branch 'clean'

Conflicts:
	app/controllers/sessions_controller.rb
	app/views/sessions/new.html.erb
	config/routes.rb

1 files changed, 45 insertions, 3 deletions

diff --git a/test/controllers/sessions_controller_test.rb b/test/controllers/sessions_controller_test.rb
index d30ebc3..a5cc8cb 100644
--- a/test/controllers/sessions_controller_test.rb
+++ b/test/controllers/sessions_controller_test.rb
@@ -1,7 +1,49 @@
 require 'test_helper'
 
 class SessionsControllerTest < ActionController::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
+  setup do
+    @session = sessions(:one)
+  end
+
+  test "should get index" do
+    get :index
+    assert_response :success
+    assert_not_nil assigns(:sessions)
+  end
+
+  test "should get new" do
+    get :new
+    assert_response :success
+  end
+
+  test "should create session" do
+    assert_difference('Session.count') do
+      post :create, session: { user_id: @session.user_id }
+    end
+
+    assert_redirected_to session_path(assigns(:session))
+  end
+
+  test "should show session" do
+    get :show, id: @session
+    assert_response :success
+  end
+
+  test "should get edit" do
+    get :edit, id: @session
+    assert_response :success
+  end
+
+  test "should update session" do
+    patch :update, id: @session, session: { user_id: @session.user_id }
+    assert_redirected_to session_path(assigns(:session))
+  end
+
+  test "should destroy session" do
+    assert_difference('Session.count', -1) do
+      delete :destroy, id: @session
+    end
+
+    assert_redirected_to sessions_path
+  end
 end