From f72b55ce938a14313091a92d84c4083c3ba4f2fd Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 5 Mar 2014 21:28:25 -0500 Subject: move the separate migrations into the original generates --- app/controllers/users_controller.rb | 2 +- app/views/users/_form.html.erb | 8 ++++++++ app/views/users/index.html.erb | 4 ++++ app/views/users/index.json.jbuilder | 2 +- app/views/users/show.html.erb | 10 ++++++++++ app/views/users/show.json.jbuilder | 2 +- db/migrate/20140306014047_create_servers.rb | 8 -------- db/migrate/20140306014050_create_tournaments.rb | 9 --------- db/migrate/20140306014052_create_matches.rb | 10 ---------- db/migrate/20140306014054_create_teams.rb | 8 -------- db/migrate/20140306014056_create_alerts.rb | 10 ---------- db/migrate/20140306014059_create_pms.rb | 11 ----------- db/migrate/20140306014101_create_games.rb | 13 ------------- db/migrate/20140306014103_create_users.rb | 11 ----------- db/migrate/20140306014106_create_sessions.rb | 9 --------- db/migrate/20140306014108_create_game_attributes.rb | 11 ----------- db/migrate/20140306014110_create_server_settings.rb | 8 -------- db/migrate/20140306014112_create_user_team_pairs.rb | 10 ---------- db/migrate/20140306014114_create_team_match_pairs.rb | 10 ---------- db/migrate/20140306014123_add_index_to_users_email.rb | 4 ---- db/migrate/20140306014125_add_index_to_users_user_name.rb | 4 ---- db/migrate/20140306014128_add_password_digest_to_users.rb | 4 ---- db/migrate/20140306014130_add_remember_token_to_users.rb | 4 ---- db/migrate/20140306014132_create_tournament_options.rb | 8 -------- db/migrate/20140306022626_create_servers.rb | 8 ++++++++ db/migrate/20140306022628_create_tournaments.rb | 9 +++++++++ db/migrate/20140306022631_create_matches.rb | 10 ++++++++++ db/migrate/20140306022633_create_teams.rb | 8 ++++++++ db/migrate/20140306022635_create_alerts.rb | 10 ++++++++++ db/migrate/20140306022638_create_pms.rb | 11 +++++++++++ db/migrate/20140306022640_create_games.rb | 13 +++++++++++++ db/migrate/20140306022642_create_users.rb | 15 +++++++++++++++ db/migrate/20140306022644_create_sessions.rb | 9 +++++++++ db/migrate/20140306022647_create_game_attributes.rb | 11 +++++++++++ db/migrate/20140306022649_create_server_settings.rb | 8 ++++++++ db/migrate/20140306022651_create_user_team_pairs.rb | 10 ++++++++++ db/migrate/20140306022653_create_team_match_pairs.rb | 10 ++++++++++ db/migrate/20140306022702_create_tournament_options.rb | 8 ++++++++ db/schema.rb | 7 ++++++- generate.sh | 9 +-------- test/controllers/users_controller_test.rb | 4 ++-- test/fixtures/users.yml | 4 ++++ 42 files changed, 178 insertions(+), 166 deletions(-) delete mode 100644 db/migrate/20140306014047_create_servers.rb delete mode 100644 db/migrate/20140306014050_create_tournaments.rb delete mode 100644 db/migrate/20140306014052_create_matches.rb delete mode 100644 db/migrate/20140306014054_create_teams.rb delete mode 100644 db/migrate/20140306014056_create_alerts.rb delete mode 100644 db/migrate/20140306014059_create_pms.rb delete mode 100644 db/migrate/20140306014101_create_games.rb delete mode 100644 db/migrate/20140306014103_create_users.rb delete mode 100644 db/migrate/20140306014106_create_sessions.rb delete mode 100644 db/migrate/20140306014108_create_game_attributes.rb delete mode 100644 db/migrate/20140306014110_create_server_settings.rb delete mode 100644 db/migrate/20140306014112_create_user_team_pairs.rb delete mode 100644 db/migrate/20140306014114_create_team_match_pairs.rb delete mode 100644 db/migrate/20140306014123_add_index_to_users_email.rb delete mode 100644 db/migrate/20140306014125_add_index_to_users_user_name.rb delete mode 100644 db/migrate/20140306014128_add_password_digest_to_users.rb delete mode 100644 db/migrate/20140306014130_add_remember_token_to_users.rb delete mode 100644 db/migrate/20140306014132_create_tournament_options.rb create mode 100644 db/migrate/20140306022626_create_servers.rb create mode 100644 db/migrate/20140306022628_create_tournaments.rb create mode 100644 db/migrate/20140306022631_create_matches.rb create mode 100644 db/migrate/20140306022633_create_teams.rb create mode 100644 db/migrate/20140306022635_create_alerts.rb create mode 100644 db/migrate/20140306022638_create_pms.rb create mode 100644 db/migrate/20140306022640_create_games.rb create mode 100644 db/migrate/20140306022642_create_users.rb create mode 100644 db/migrate/20140306022644_create_sessions.rb create mode 100644 db/migrate/20140306022647_create_game_attributes.rb create mode 100644 db/migrate/20140306022649_create_server_settings.rb create mode 100644 db/migrate/20140306022651_create_user_team_pairs.rb create mode 100644 db/migrate/20140306022653_create_team_match_pairs.rb create mode 100644 db/migrate/20140306022702_create_tournament_options.rb diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index b18efed..989ef76 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -69,6 +69,6 @@ class UsersController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def user_params - params.require(:user).permit(:name, :email, :user_name) + params.require(:user).permit(:name, :email, :user_name, :password_digest, :remember_token) end end diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb index 4d28738..ad89f47 100644 --- a/app/views/users/_form.html.erb +++ b/app/views/users/_form.html.erb @@ -23,6 +23,14 @@ <%= f.label :user_name %>
<%= f.text_field :user_name %> +
+ <%= f.label :password_digest %>
+ <%= f.text_field :password_digest %> +
+
+ <%= f.label :remember_token %>
+ <%= f.text_field :remember_token %> +
<%= f.submit %>
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index 3692112..c0d52a0 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -6,6 +6,8 @@ Name Email User name + Password digest + Remember token @@ -18,6 +20,8 @@ <%= user.name %> <%= user.email %> <%= user.user_name %> + <%= user.password_digest %> + <%= user.remember_token %> <%= link_to 'Show', user %> <%= link_to 'Edit', edit_user_path(user) %> <%= link_to 'Destroy', user, method: :delete, data: { confirm: 'Are you sure?' } %> diff --git a/app/views/users/index.json.jbuilder b/app/views/users/index.json.jbuilder index 42d8b72..cf21a4a 100644 --- a/app/views/users/index.json.jbuilder +++ b/app/views/users/index.json.jbuilder @@ -1,4 +1,4 @@ json.array!(@users) do |user| - json.extract! user, :id, :name, :email, :user_name + json.extract! user, :id, :name, :email, :user_name, :password_digest, :remember_token json.url user_url(user, format: :json) end diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 9455a3c..a0fa94c 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -15,5 +15,15 @@ <%= @user.user_name %>

+

+ Password digest: + <%= @user.password_digest %> +

+ +

+ Remember token: + <%= @user.remember_token %> +

+ <%= link_to 'Edit', edit_user_path(@user) %> | <%= link_to 'Back', users_path %> diff --git a/app/views/users/show.json.jbuilder b/app/views/users/show.json.jbuilder index 4919af3..11b0784 100644 --- a/app/views/users/show.json.jbuilder +++ b/app/views/users/show.json.jbuilder @@ -1 +1 @@ -json.extract! @user, :id, :name, :email, :user_name, :created_at, :updated_at +json.extract! @user, :id, :name, :email, :user_name, :password_digest, :remember_token, :created_at, :updated_at diff --git a/db/migrate/20140306014047_create_servers.rb b/db/migrate/20140306014047_create_servers.rb deleted file mode 100644 index f33241a..0000000 --- a/db/migrate/20140306014047_create_servers.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateServers < ActiveRecord::Migration - def change - create_table :servers do |t| - - t.timestamps - end - end -end diff --git a/db/migrate/20140306014050_create_tournaments.rb b/db/migrate/20140306014050_create_tournaments.rb deleted file mode 100644 index 36fcf7e..0000000 --- a/db/migrate/20140306014050_create_tournaments.rb +++ /dev/null @@ -1,9 +0,0 @@ -class CreateTournaments < ActiveRecord::Migration - def change - create_table :tournaments do |t| - t.references :game, index: true - - t.timestamps - end - end -end diff --git a/db/migrate/20140306014052_create_matches.rb b/db/migrate/20140306014052_create_matches.rb deleted file mode 100644 index 325863d..0000000 --- a/db/migrate/20140306014052_create_matches.rb +++ /dev/null @@ -1,10 +0,0 @@ -class CreateMatches < ActiveRecord::Migration - def change - create_table :matches do |t| - t.references :tournament, index: true - t.string :name - - t.timestamps - end - end -end diff --git a/db/migrate/20140306014054_create_teams.rb b/db/migrate/20140306014054_create_teams.rb deleted file mode 100644 index dd8397d..0000000 --- a/db/migrate/20140306014054_create_teams.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateTeams < ActiveRecord::Migration - def change - create_table :teams do |t| - - t.timestamps - end - end -end diff --git a/db/migrate/20140306014056_create_alerts.rb b/db/migrate/20140306014056_create_alerts.rb deleted file mode 100644 index 68a8e10..0000000 --- a/db/migrate/20140306014056_create_alerts.rb +++ /dev/null @@ -1,10 +0,0 @@ -class CreateAlerts < ActiveRecord::Migration - def change - create_table :alerts do |t| - t.references :author, index: true - t.text :message - - t.timestamps - end - end -end diff --git a/db/migrate/20140306014059_create_pms.rb b/db/migrate/20140306014059_create_pms.rb deleted file mode 100644 index 93bb5c6..0000000 --- a/db/migrate/20140306014059_create_pms.rb +++ /dev/null @@ -1,11 +0,0 @@ -class CreatePms < ActiveRecord::Migration - def change - create_table :pms do |t| - t.references :author, index: true - t.references :recipient, index: true - t.text :message - - t.timestamps - end - end -end diff --git a/db/migrate/20140306014101_create_games.rb b/db/migrate/20140306014101_create_games.rb deleted file mode 100644 index 59d4ef0..0000000 --- a/db/migrate/20140306014101_create_games.rb +++ /dev/null @@ -1,13 +0,0 @@ -class CreateGames < ActiveRecord::Migration - def change - create_table :games do |t| - t.text :name - t.integer :players_per_team - t.integer :teams_per_match - t.integer :set_rounds - t.integer :randomized_teams - - t.timestamps - end - end -end diff --git a/db/migrate/20140306014103_create_users.rb b/db/migrate/20140306014103_create_users.rb deleted file mode 100644 index f0986d4..0000000 --- a/db/migrate/20140306014103_create_users.rb +++ /dev/null @@ -1,11 +0,0 @@ -class CreateUsers < ActiveRecord::Migration - def change - create_table :users do |t| - t.string :name - t.string :email - t.string :user_name - - t.timestamps - end - end -end diff --git a/db/migrate/20140306014106_create_sessions.rb b/db/migrate/20140306014106_create_sessions.rb deleted file mode 100644 index fe25bf2..0000000 --- a/db/migrate/20140306014106_create_sessions.rb +++ /dev/null @@ -1,9 +0,0 @@ -class CreateSessions < ActiveRecord::Migration - def change - create_table :sessions do |t| - t.references :user, index: true - - t.timestamps - end - end -end diff --git a/db/migrate/20140306014108_create_game_attributes.rb b/db/migrate/20140306014108_create_game_attributes.rb deleted file mode 100644 index b63f134..0000000 --- a/db/migrate/20140306014108_create_game_attributes.rb +++ /dev/null @@ -1,11 +0,0 @@ -class CreateGameAttributes < ActiveRecord::Migration - def change - create_table :game_attributes do |t| - t.references :game, index: true - t.text :key - t.integer :type - - t.timestamps - end - end -end diff --git a/db/migrate/20140306014110_create_server_settings.rb b/db/migrate/20140306014110_create_server_settings.rb deleted file mode 100644 index dfdd91b..0000000 --- a/db/migrate/20140306014110_create_server_settings.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateServerSettings < ActiveRecord::Migration - def change - create_table :server_settings do |t| - - t.timestamps - end - end -end diff --git a/db/migrate/20140306014112_create_user_team_pairs.rb b/db/migrate/20140306014112_create_user_team_pairs.rb deleted file mode 100644 index 2c492ac..0000000 --- a/db/migrate/20140306014112_create_user_team_pairs.rb +++ /dev/null @@ -1,10 +0,0 @@ -class CreateUserTeamPairs < ActiveRecord::Migration - def change - create_table :user_team_pairs do |t| - t.references :user, index: true - t.references :team, index: true - - t.timestamps - end - end -end diff --git a/db/migrate/20140306014114_create_team_match_pairs.rb b/db/migrate/20140306014114_create_team_match_pairs.rb deleted file mode 100644 index 8fac07e..0000000 --- a/db/migrate/20140306014114_create_team_match_pairs.rb +++ /dev/null @@ -1,10 +0,0 @@ -class CreateTeamMatchPairs < ActiveRecord::Migration - def change - create_table :team_match_pairs do |t| - t.references :team, index: true - t.references :match, index: true - - t.timestamps - end - end -end diff --git a/db/migrate/20140306014123_add_index_to_users_email.rb b/db/migrate/20140306014123_add_index_to_users_email.rb deleted file mode 100644 index b5f8a1a..0000000 --- a/db/migrate/20140306014123_add_index_to_users_email.rb +++ /dev/null @@ -1,4 +0,0 @@ -class AddIndexToUsersEmail < ActiveRecord::Migration - def change - end -end diff --git a/db/migrate/20140306014125_add_index_to_users_user_name.rb b/db/migrate/20140306014125_add_index_to_users_user_name.rb deleted file mode 100644 index 724cca5..0000000 --- a/db/migrate/20140306014125_add_index_to_users_user_name.rb +++ /dev/null @@ -1,4 +0,0 @@ -class AddIndexToUsersUserName < ActiveRecord::Migration - def change - end -end diff --git a/db/migrate/20140306014128_add_password_digest_to_users.rb b/db/migrate/20140306014128_add_password_digest_to_users.rb deleted file mode 100644 index 0070da7..0000000 --- a/db/migrate/20140306014128_add_password_digest_to_users.rb +++ /dev/null @@ -1,4 +0,0 @@ -class AddPasswordDigestToUsers < ActiveRecord::Migration - def change - end -end diff --git a/db/migrate/20140306014130_add_remember_token_to_users.rb b/db/migrate/20140306014130_add_remember_token_to_users.rb deleted file mode 100644 index 74c254f..0000000 --- a/db/migrate/20140306014130_add_remember_token_to_users.rb +++ /dev/null @@ -1,4 +0,0 @@ -class AddRememberTokenToUsers < ActiveRecord::Migration - def change - end -end diff --git a/db/migrate/20140306014132_create_tournament_options.rb b/db/migrate/20140306014132_create_tournament_options.rb deleted file mode 100644 index d2df22e..0000000 --- a/db/migrate/20140306014132_create_tournament_options.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateTournamentOptions < ActiveRecord::Migration - def change - create_table :tournament_options do |t| - - t.timestamps - end - end -end diff --git a/db/migrate/20140306022626_create_servers.rb b/db/migrate/20140306022626_create_servers.rb new file mode 100644 index 0000000..f33241a --- /dev/null +++ b/db/migrate/20140306022626_create_servers.rb @@ -0,0 +1,8 @@ +class CreateServers < ActiveRecord::Migration + def change + create_table :servers do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20140306022628_create_tournaments.rb b/db/migrate/20140306022628_create_tournaments.rb new file mode 100644 index 0000000..36fcf7e --- /dev/null +++ b/db/migrate/20140306022628_create_tournaments.rb @@ -0,0 +1,9 @@ +class CreateTournaments < ActiveRecord::Migration + def change + create_table :tournaments do |t| + t.references :game, index: true + + t.timestamps + end + end +end diff --git a/db/migrate/20140306022631_create_matches.rb b/db/migrate/20140306022631_create_matches.rb new file mode 100644 index 0000000..325863d --- /dev/null +++ b/db/migrate/20140306022631_create_matches.rb @@ -0,0 +1,10 @@ +class CreateMatches < ActiveRecord::Migration + def change + create_table :matches do |t| + t.references :tournament, index: true + t.string :name + + t.timestamps + end + end +end diff --git a/db/migrate/20140306022633_create_teams.rb b/db/migrate/20140306022633_create_teams.rb new file mode 100644 index 0000000..dd8397d --- /dev/null +++ b/db/migrate/20140306022633_create_teams.rb @@ -0,0 +1,8 @@ +class CreateTeams < ActiveRecord::Migration + def change + create_table :teams do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20140306022635_create_alerts.rb b/db/migrate/20140306022635_create_alerts.rb new file mode 100644 index 0000000..68a8e10 --- /dev/null +++ b/db/migrate/20140306022635_create_alerts.rb @@ -0,0 +1,10 @@ +class CreateAlerts < ActiveRecord::Migration + def change + create_table :alerts do |t| + t.references :author, index: true + t.text :message + + t.timestamps + end + end +end diff --git a/db/migrate/20140306022638_create_pms.rb b/db/migrate/20140306022638_create_pms.rb new file mode 100644 index 0000000..93bb5c6 --- /dev/null +++ b/db/migrate/20140306022638_create_pms.rb @@ -0,0 +1,11 @@ +class CreatePms < ActiveRecord::Migration + def change + create_table :pms do |t| + t.references :author, index: true + t.references :recipient, index: true + t.text :message + + t.timestamps + end + end +end diff --git a/db/migrate/20140306022640_create_games.rb b/db/migrate/20140306022640_create_games.rb new file mode 100644 index 0000000..59d4ef0 --- /dev/null +++ b/db/migrate/20140306022640_create_games.rb @@ -0,0 +1,13 @@ +class CreateGames < ActiveRecord::Migration + def change + create_table :games do |t| + t.text :name + t.integer :players_per_team + t.integer :teams_per_match + t.integer :set_rounds + t.integer :randomized_teams + + t.timestamps + end + end +end diff --git a/db/migrate/20140306022642_create_users.rb b/db/migrate/20140306022642_create_users.rb new file mode 100644 index 0000000..f416771 --- /dev/null +++ b/db/migrate/20140306022642_create_users.rb @@ -0,0 +1,15 @@ +class CreateUsers < ActiveRecord::Migration + def change + create_table :users do |t| + t.string :name + t.string :email + t.string :user_name + t.string :password_digest + t.string :remember_token + + t.timestamps + end + add_index :users, :email, unique: true + add_index :users, :user_name, unique: true + end +end diff --git a/db/migrate/20140306022644_create_sessions.rb b/db/migrate/20140306022644_create_sessions.rb new file mode 100644 index 0000000..fe25bf2 --- /dev/null +++ b/db/migrate/20140306022644_create_sessions.rb @@ -0,0 +1,9 @@ +class CreateSessions < ActiveRecord::Migration + def change + create_table :sessions do |t| + t.references :user, index: true + + t.timestamps + end + end +end diff --git a/db/migrate/20140306022647_create_game_attributes.rb b/db/migrate/20140306022647_create_game_attributes.rb new file mode 100644 index 0000000..b63f134 --- /dev/null +++ b/db/migrate/20140306022647_create_game_attributes.rb @@ -0,0 +1,11 @@ +class CreateGameAttributes < ActiveRecord::Migration + def change + create_table :game_attributes do |t| + t.references :game, index: true + t.text :key + t.integer :type + + t.timestamps + end + end +end diff --git a/db/migrate/20140306022649_create_server_settings.rb b/db/migrate/20140306022649_create_server_settings.rb new file mode 100644 index 0000000..dfdd91b --- /dev/null +++ b/db/migrate/20140306022649_create_server_settings.rb @@ -0,0 +1,8 @@ +class CreateServerSettings < ActiveRecord::Migration + def change + create_table :server_settings do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20140306022651_create_user_team_pairs.rb b/db/migrate/20140306022651_create_user_team_pairs.rb new file mode 100644 index 0000000..2c492ac --- /dev/null +++ b/db/migrate/20140306022651_create_user_team_pairs.rb @@ -0,0 +1,10 @@ +class CreateUserTeamPairs < ActiveRecord::Migration + def change + create_table :user_team_pairs do |t| + t.references :user, index: true + t.references :team, index: true + + t.timestamps + end + end +end diff --git a/db/migrate/20140306022653_create_team_match_pairs.rb b/db/migrate/20140306022653_create_team_match_pairs.rb new file mode 100644 index 0000000..8fac07e --- /dev/null +++ b/db/migrate/20140306022653_create_team_match_pairs.rb @@ -0,0 +1,10 @@ +class CreateTeamMatchPairs < ActiveRecord::Migration + def change + create_table :team_match_pairs do |t| + t.references :team, index: true + t.references :match, index: true + + t.timestamps + end + end +end diff --git a/db/migrate/20140306022702_create_tournament_options.rb b/db/migrate/20140306022702_create_tournament_options.rb new file mode 100644 index 0000000..d2df22e --- /dev/null +++ b/db/migrate/20140306022702_create_tournament_options.rb @@ -0,0 +1,8 @@ +class CreateTournamentOptions < ActiveRecord::Migration + def change + create_table :tournament_options do |t| + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index e700a4a..ca583d1 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20140306014132) do +ActiveRecord::Schema.define(version: 20140306022702) do create_table "alerts", force: true do |t| t.integer "author_id" @@ -122,8 +122,13 @@ ActiveRecord::Schema.define(version: 20140306014132) do t.string "name" t.string "email" t.string "user_name" + t.string "password_digest" + t.string "remember_token" t.datetime "created_at" t.datetime "updated_at" end + add_index "users", ["email"], name: "index_users_on_email", unique: true + add_index "users", ["user_name"], name: "index_users_on_user_name", unique: true + end diff --git a/generate.sh b/generate.sh index 0d07743..da55bca 100755 --- a/generate.sh +++ b/generate.sh @@ -24,7 +24,7 @@ bundle exec rails generate scaffold team $NOTEST bundle exec rails generate scaffold alert author:references message:text $NOTEST bundle exec rails generate scaffold pm author:references recipient:references message:text $NOTEST bundle exec rails generate scaffold game name:text players_per_team:integer teams_per_match:integer set_rounds:integer randomized_teams:integer --force $NOTEST -bundle exec rails generate scaffold user name:string email:string user_name:string $NOTEST +bundle exec rails generate scaffold user name:string email:string:uniq user_name:string:uniq password_digest:string remember_token:string bundle exec rails generate scaffold session user:references # Just models @@ -38,13 +38,6 @@ bundle exec rails generate controller search $NOTEST bundle exec rails generate controller main $NOTEST bundle exec rails generate controller static $NOTEST -#added some stuff to the database - -bundle exec rails generate migration add_index_to_users_email -bundle exec rails generate migration add_index_to_users_user_name -bundle exec rails generate migration add_password_digest_to_users -bundle exec rails generate migration add_remember_token_to_users - #for the tournament controller to generate options bundle exec rails generate model tournament_option $NOTEST #bundle exec rails generate scaffold diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index 79a5700..fc06f63 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -18,7 +18,7 @@ class UsersControllerTest < ActionController::TestCase test "should create user" do assert_difference('User.count') do - post :create, user: { email: @user.email, name: @user.name, user_name: @user.user_name } + post :create, user: { email: @user.email, name: @user.name, password_digest: @user.password_digest, remember_token: @user.remember_token, user_name: @user.user_name } end assert_redirected_to user_path(assigns(:user)) @@ -35,7 +35,7 @@ class UsersControllerTest < ActionController::TestCase end test "should update user" do - patch :update, id: @user, user: { email: @user.email, name: @user.name, user_name: @user.user_name } + patch :update, id: @user, user: { email: @user.email, name: @user.name, password_digest: @user.password_digest, remember_token: @user.remember_token, user_name: @user.user_name } assert_redirected_to user_path(assigns(:user)) end diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml index ea3e874..cf39694 100644 --- a/test/fixtures/users.yml +++ b/test/fixtures/users.yml @@ -4,8 +4,12 @@ one: name: MyString email: MyString user_name: MyString + password_digest: MyString + remember_token: MyString two: name: MyString email: MyString user_name: MyString + password_digest: MyString + remember_token: MyString -- cgit v1.2.3