changed the user section of the generate

3 files changed, 10 insertions, 52 deletions

diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb
index 8bcd10b..d23f182 100644
--- a/test/controllers/users_controller_test.rb
+++ b/test/controllers/users_controller_test.rb
@@ -1,49 +1,7 @@
 require 'test_helper'
 
 class UsersControllerTest < ActionController::TestCase
-  setup do
-    @user = users(:one)
-  end
-
-  test "should get index" do
-    get :index
-    assert_response :success
-    assert_not_nil assigns(:users)
-  end
-
-  test "should get new" do
-    get :new
-    assert_response :success
-  end
-
-  test "should create user" do
-    assert_difference('User.count') do
-      post :create, user: { groups: @user.groups, name: @user.name, pw_hash: @user.pw_hash }
-    end
-
-    assert_redirected_to user_path(assigns(:user))
-  end
-
-  test "should show user" do
-    get :show, id: @user
-    assert_response :success
-  end
-
-  test "should get edit" do
-    get :edit, id: @user
-    assert_response :success
-  end
-
-  test "should update user" do
-    patch :update, id: @user, user: { groups: @user.groups, name: @user.name, pw_hash: @user.pw_hash }
-    assert_redirected_to user_path(assigns(:user))
-  end
-
-  test "should destroy user" do
-    assert_difference('User.count', -1) do
-      delete :destroy, id: @user
-    end
-
-    assert_redirected_to users_path
-  end
+  # test "the truth" do
+  #   assert true
+  # end
 end
diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml
index 9f593bc..ea3e874 100644
--- a/test/fixtures/users.yml
+++ b/test/fixtures/users.yml
@@ -1,11 +1,11 @@
 # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
 
 one:
-  name: MyText
-  pw_hash: MyText
-  groups: 1
+  name: MyString
+  email: MyString
+  user_name: MyString
 
 two:
-  name: MyText
-  pw_hash: MyText
-  groups: 1
+  name: MyString
+  email: MyString
+  user_name: MyString
diff --git a/test/models/tournament_options_test.rb b/test/models/tournament_option_test.rb
index 7677fae..8fa9628 100644
--- a/test/models/tournament_options_test.rb
+++ b/test/models/tournament_option_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class TournamentOptionsTest < ActiveSupport::TestCase
+class TournamentOptionTest < ActiveSupport::TestCase
   # test "the truth" do
   #   assert true
   # end