Merge branch 'clean4'

Conflicts:
	app/assets/stylesheets/scaffolds.css.scss
	app/assets/stylesheets/static.css.scss
	app/controllers/sessions_controller.rb
	app/controllers/static_controller.rb
	app/controllers/tournaments_controller.rb
	app/controllers/users_controller.rb
	app/helpers/sessions_helper.rb
	app/models/game.rb
	app/models/user.rb
	app/views/games/index.html.erb
	app/views/tournaments/index.html.erb
	app/views/tournaments/new.html.erb
	app/views/users/_form.html.erb
	app/views/users/index.html.erb
	app/views/users/index.json.jbuilder
	app/views/users/new.html.erb
	app/views/users/show.html.erb
	app/views/users/show.json.jbuilder
	config/routes.rb
	generate.sh

1 files changed, 49 insertions, 0 deletions

diff --git a/test/controllers/pms_controller_test.rb b/test/controllers/pms_controller_test.rb
new file mode 100644
index 0000000..18b2449
--- /dev/null
+++ b/test/controllers/pms_controller_test.rb
@@ -0,0 +1,49 @@
+require 'test_helper'
+
+class PmsControllerTest < ActionController::TestCase
+  setup do
+    @pm = pms(:one)
+  end
+
+  test "should get index" do
+    get :index
+    assert_response :success
+    assert_not_nil assigns(:pms)
+  end
+
+  test "should get new" do
+    get :new
+    assert_response :success
+  end
+
+  test "should create pm" do
+    assert_difference('Pm.count') do
+      post :create, pm: { author_id: @pm.author_id, message: @pm.message, recipient_id: @pm.recipient_id }
+    end
+
+    assert_redirected_to pm_path(assigns(:pm))
+  end
+
+  test "should show pm" do
+    get :show, id: @pm
+    assert_response :success
+  end
+
+  test "should get edit" do
+    get :edit, id: @pm
+    assert_response :success
+  end
+
+  test "should update pm" do
+    patch :update, id: @pm, pm: { author_id: @pm.author_id, message: @pm.message, recipient_id: @pm.recipient_id }
+    assert_redirected_to pm_path(assigns(:pm))
+  end
+
+  test "should destroy pm" do
+    assert_difference('Pm.count', -1) do
+      delete :destroy, id: @pm
+    end
+
+    assert_redirected_to pms_path
+  end
+end