Merge branch 'clean2'

Conflicts:
	config/routes.rb
	db/schema.rb

1 files changed, 0 insertions, 49 deletions

diff --git a/test/controllers/remote_usernames_controller_test.rb b/test/controllers/remote_usernames_controller_test.rb
deleted file mode 100644
index ff6a91d..0000000
--- a/test/controllers/remote_usernames_controller_test.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-require 'test_helper'
-
-class RemoteUsernamesControllerTest < ActionController::TestCase
-  setup do
-    @remote_username = remote_usernames(:one)
-  end
-
-  test "should get index" do
-    get :index
-    assert_response :success
-    assert_not_nil assigns(:remote_usernames)
-  end
-
-  test "should get new" do
-    get :new
-    assert_response :success
-  end
-
-  test "should create remote_username" do
-    assert_difference('RemoteUsername.count') do
-      post :create, remote_username: { game_id: @remote_username.game_id, user_id: @remote_username.user_id, user_name: @remote_username.user_name }
-    end
-
-    assert_redirected_to remote_username_path(assigns(:remote_username))
-  end
-
-  test "should show remote_username" do
-    get :show, id: @remote_username
-    assert_response :success
-  end
-
-  test "should get edit" do
-    get :edit, id: @remote_username
-    assert_response :success
-  end
-
-  test "should update remote_username" do
-    patch :update, id: @remote_username, remote_username: { game_id: @remote_username.game_id, user_id: @remote_username.user_id, user_name: @remote_username.user_name }
-    assert_redirected_to remote_username_path(assigns(:remote_username))
-  end
-
-  test "should destroy remote_username" do
-    assert_difference('RemoteUsername.count', -1) do
-      delete :destroy, id: @remote_username
-    end
-
-    assert_redirected_to remote_usernames_path
-  end
-end