From 2eb242f3e5b1f1ab66d84556cabcad965fe387aa Mon Sep 17 00:00:00 2001 From: DavisLWebb Date: Sat, 1 Mar 2014 20:23:29 -0500 Subject: changed the user section of the generate --- app/controllers/users_controller.rb | 72 ---------------------- app/models/tournament_option.rb | 2 + app/models/tournament_options.rb | 2 - app/views/users/_form.html.erb | 29 --------- app/views/users/edit.html.erb | 6 -- app/views/users/index.html.erb | 31 ---------- app/views/users/index.json.jbuilder | 4 -- app/views/users/new.html.erb | 5 -- app/views/users/show.html.erb | 19 ------ app/views/users/show.json.jbuilder | 1 - config/routes.rb | 2 - db/migrate/20140304015447_create_servers.rb | 8 --- db/migrate/20140304015449_create_tournaments.rb | 9 --- db/migrate/20140304015452_create_matches.rb | 9 --- db/migrate/20140304015454_create_teams.rb | 8 --- db/migrate/20140304015456_create_users.rb | 11 ---- .../20140304015458_create_user_team_pairs.rb | 10 --- .../20140304015500_create_team_match_pairs.rb | 10 --- db/migrate/20140304015502_create_alerts.rb | 10 --- db/migrate/20140304015505_create_pms.rb | 11 ---- db/migrate/20140304015507_create_games.rb | 13 ---- .../20140304015509_create_game_attributes.rb | 11 ---- .../20140304015511_create_server_settings.rb | 8 --- .../20140304015517_create_tournament_options.rb | 8 --- db/migrate/20140304015527_create_servers.rb | 8 +++ db/migrate/20140304015530_create_tournaments.rb | 9 +++ db/migrate/20140304015532_create_matches.rb | 9 +++ db/migrate/20140304015534_create_teams.rb | 8 +++ db/migrate/20140304015538_create_users.rb | 11 ++++ .../20140304015540_create_user_team_pairs.rb | 10 +++ .../20140304015542_create_team_match_pairs.rb | 10 +++ db/migrate/20140304015544_create_alerts.rb | 10 +++ db/migrate/20140304015547_create_pms.rb | 11 ++++ db/migrate/20140304015549_create_games.rb | 13 ++++ .../20140304015551_create_game_attributes.rb | 11 ++++ .../20140304015553_create_server_settings.rb | 8 +++ .../20140304015559_create_tournament_options.rb | 8 +++ db/schema.rb | 8 +-- generate.sh | 32 +++++----- test/controllers/users_controller_test.rb | 48 +-------------- test/fixtures/users.yml | 12 ++-- test/models/tournament_option_test.rb | 7 +++ test/models/tournament_options_test.rb | 7 --- 43 files changed, 165 insertions(+), 374 deletions(-) create mode 100644 app/models/tournament_option.rb delete mode 100644 app/models/tournament_options.rb delete mode 100644 app/views/users/_form.html.erb delete mode 100644 app/views/users/edit.html.erb delete mode 100644 app/views/users/index.html.erb delete mode 100644 app/views/users/index.json.jbuilder delete mode 100644 app/views/users/new.html.erb delete mode 100644 app/views/users/show.html.erb delete mode 100644 app/views/users/show.json.jbuilder delete mode 100644 db/migrate/20140304015447_create_servers.rb delete mode 100644 db/migrate/20140304015449_create_tournaments.rb delete mode 100644 db/migrate/20140304015452_create_matches.rb delete mode 100644 db/migrate/20140304015454_create_teams.rb delete mode 100644 db/migrate/20140304015456_create_users.rb delete mode 100644 db/migrate/20140304015458_create_user_team_pairs.rb delete mode 100644 db/migrate/20140304015500_create_team_match_pairs.rb delete mode 100644 db/migrate/20140304015502_create_alerts.rb delete mode 100644 db/migrate/20140304015505_create_pms.rb delete mode 100644 db/migrate/20140304015507_create_games.rb delete mode 100644 db/migrate/20140304015509_create_game_attributes.rb delete mode 100644 db/migrate/20140304015511_create_server_settings.rb delete mode 100644 db/migrate/20140304015517_create_tournament_options.rb create mode 100644 db/migrate/20140304015527_create_servers.rb create mode 100644 db/migrate/20140304015530_create_tournaments.rb create mode 100644 db/migrate/20140304015532_create_matches.rb create mode 100644 db/migrate/20140304015534_create_teams.rb create mode 100644 db/migrate/20140304015538_create_users.rb create mode 100644 db/migrate/20140304015540_create_user_team_pairs.rb create mode 100644 db/migrate/20140304015542_create_team_match_pairs.rb create mode 100644 db/migrate/20140304015544_create_alerts.rb create mode 100644 db/migrate/20140304015547_create_pms.rb create mode 100644 db/migrate/20140304015549_create_games.rb create mode 100644 db/migrate/20140304015551_create_game_attributes.rb create mode 100644 db/migrate/20140304015553_create_server_settings.rb create mode 100644 db/migrate/20140304015559_create_tournament_options.rb create mode 100644 test/models/tournament_option_test.rb delete mode 100644 test/models/tournament_options_test.rb diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 4db617e..3e74dea 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,74 +1,2 @@ class UsersController < ApplicationController - before_action :set_user, only: [:show, :edit, :update, :destroy] - - # GET /users - # GET /users.json - def index - @users = User.all - end - - # GET /users/1 - # GET /users/1.json - def show - end - - # GET /users/new - def new - @user = User.new - end - - # GET /users/1/edit - def edit - end - - # POST /users - # POST /users.json - def create - @user = User.new(user_params) - - respond_to do |format| - if @user.save - format.html { redirect_to @user, notice: 'User was successfully created.' } - format.json { render action: 'show', status: :created, location: @user } - else - format.html { render action: 'new' } - format.json { render json: @user.errors, status: :unprocessable_entity } - end - end - end - - # PATCH/PUT /users/1 - # PATCH/PUT /users/1.json - def update - respond_to do |format| - if @user.update(user_params) - format.html { redirect_to @user, notice: 'User was successfully updated.' } - format.json { head :no_content } - else - format.html { render action: 'edit' } - format.json { render json: @user.errors, status: :unprocessable_entity } - end - end - end - - # DELETE /users/1 - # DELETE /users/1.json - def destroy - @user.destroy - respond_to do |format| - format.html { redirect_to users_url } - format.json { head :no_content } - end - end - - private - # Use callbacks to share common setup or constraints between actions. - def set_user - @user = User.find(params[:id]) - end - - # Never trust parameters from the scary internet, only allow the white list through. - def user_params - params.require(:user).permit(:name, :pw_hash, :groups) - end end diff --git a/app/models/tournament_option.rb b/app/models/tournament_option.rb new file mode 100644 index 0000000..950b351 --- /dev/null +++ b/app/models/tournament_option.rb @@ -0,0 +1,2 @@ +class TournamentOption < ActiveRecord::Base +end diff --git a/app/models/tournament_options.rb b/app/models/tournament_options.rb deleted file mode 100644 index 8ed6433..0000000 --- a/app/models/tournament_options.rb +++ /dev/null @@ -1,2 +0,0 @@ -class TournamentOptions < ActiveRecord::Base -end diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb deleted file mode 100644 index 2d1ad24..0000000 --- a/app/views/users/_form.html.erb +++ /dev/null @@ -1,29 +0,0 @@ -<%= form_for(@user) do |f| %> - <% if @user.errors.any? %> -
-

<%= pluralize(@user.errors.count, "error") %> prohibited this user from being saved:

- - -
- <% end %> - -
- <%= f.label :name %>
- <%= f.text_area :name %> -
-
- <%= f.label :pw_hash %>
- <%= f.text_area :pw_hash %> -
-
- <%= f.label :groups %>
- <%= f.number_field :groups %> -
-
- <%= f.submit %> -
-<% end %> diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb deleted file mode 100644 index 99bd4cc..0000000 --- a/app/views/users/edit.html.erb +++ /dev/null @@ -1,6 +0,0 @@ -

Editing user

- -<%= render 'form' %> - -<%= link_to 'Show', @user %> | -<%= link_to 'Back', users_path %> diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb deleted file mode 100644 index 14739ae..0000000 --- a/app/views/users/index.html.erb +++ /dev/null @@ -1,31 +0,0 @@ -

Listing users

- - - - - - - - - - - - - - - <% @users.each do |user| %> - - - - - - - - - <% end %> - -
NamePw hashGroups
<%= user.name %><%= user.pw_hash %><%= user.groups %><%= link_to 'Show', user %><%= link_to 'Edit', edit_user_path(user) %><%= link_to 'Destroy', user, method: :delete, data: { confirm: 'Are you sure?' } %>
- -
- -<%= link_to 'New User', new_user_path %> diff --git a/app/views/users/index.json.jbuilder b/app/views/users/index.json.jbuilder deleted file mode 100644 index 58c42c1..0000000 --- a/app/views/users/index.json.jbuilder +++ /dev/null @@ -1,4 +0,0 @@ -json.array!(@users) do |user| - json.extract! user, :id, :name, :pw_hash, :groups - json.url user_url(user, format: :json) -end diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb deleted file mode 100644 index efc0404..0000000 --- a/app/views/users/new.html.erb +++ /dev/null @@ -1,5 +0,0 @@ -

New user

- -<%= render 'form' %> - -<%= link_to 'Back', users_path %> diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb deleted file mode 100644 index 05150f5..0000000 --- a/app/views/users/show.html.erb +++ /dev/null @@ -1,19 +0,0 @@ -

<%= notice %>

- -

- Name: - <%= @user.name %> -

- -

- Pw hash: - <%= @user.pw_hash %> -

- -

- Groups: - <%= @user.groups %> -

- -<%= 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 deleted file mode 100644 index 968b383..0000000 --- a/app/views/users/show.json.jbuilder +++ /dev/null @@ -1 +0,0 @@ -json.extract! @user, :id, :name, :pw_hash, :groups, :created_at, :updated_at diff --git a/config/routes.rb b/config/routes.rb index 3412005..149c321 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -5,8 +5,6 @@ Leaguer::Application.routes.draw do resources :alerts - resources :users - resources :teams resources :matches diff --git a/db/migrate/20140304015447_create_servers.rb b/db/migrate/20140304015447_create_servers.rb deleted file mode 100644 index f33241a..0000000 --- a/db/migrate/20140304015447_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/20140304015449_create_tournaments.rb b/db/migrate/20140304015449_create_tournaments.rb deleted file mode 100644 index 36fcf7e..0000000 --- a/db/migrate/20140304015449_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/20140304015452_create_matches.rb b/db/migrate/20140304015452_create_matches.rb deleted file mode 100644 index 6c0c157..0000000 --- a/db/migrate/20140304015452_create_matches.rb +++ /dev/null @@ -1,9 +0,0 @@ -class CreateMatches < ActiveRecord::Migration - def change - create_table :matches do |t| - t.references :tournament, index: true - - t.timestamps - end - end -end diff --git a/db/migrate/20140304015454_create_teams.rb b/db/migrate/20140304015454_create_teams.rb deleted file mode 100644 index dd8397d..0000000 --- a/db/migrate/20140304015454_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/20140304015456_create_users.rb b/db/migrate/20140304015456_create_users.rb deleted file mode 100644 index 6a500e5..0000000 --- a/db/migrate/20140304015456_create_users.rb +++ /dev/null @@ -1,11 +0,0 @@ -class CreateUsers < ActiveRecord::Migration - def change - create_table :users do |t| - t.text :name - t.text :pw_hash - t.integer :groups - - t.timestamps - end - end -end diff --git a/db/migrate/20140304015458_create_user_team_pairs.rb b/db/migrate/20140304015458_create_user_team_pairs.rb deleted file mode 100644 index 2c492ac..0000000 --- a/db/migrate/20140304015458_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/20140304015500_create_team_match_pairs.rb b/db/migrate/20140304015500_create_team_match_pairs.rb deleted file mode 100644 index 8fac07e..0000000 --- a/db/migrate/20140304015500_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/20140304015502_create_alerts.rb b/db/migrate/20140304015502_create_alerts.rb deleted file mode 100644 index 68a8e10..0000000 --- a/db/migrate/20140304015502_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/20140304015505_create_pms.rb b/db/migrate/20140304015505_create_pms.rb deleted file mode 100644 index 93bb5c6..0000000 --- a/db/migrate/20140304015505_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/20140304015507_create_games.rb b/db/migrate/20140304015507_create_games.rb deleted file mode 100644 index 59d4ef0..0000000 --- a/db/migrate/20140304015507_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/20140304015509_create_game_attributes.rb b/db/migrate/20140304015509_create_game_attributes.rb deleted file mode 100644 index b63f134..0000000 --- a/db/migrate/20140304015509_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/20140304015511_create_server_settings.rb b/db/migrate/20140304015511_create_server_settings.rb deleted file mode 100644 index dfdd91b..0000000 --- a/db/migrate/20140304015511_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/20140304015517_create_tournament_options.rb b/db/migrate/20140304015517_create_tournament_options.rb deleted file mode 100644 index d2df22e..0000000 --- a/db/migrate/20140304015517_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/20140304015527_create_servers.rb b/db/migrate/20140304015527_create_servers.rb new file mode 100644 index 0000000..f33241a --- /dev/null +++ b/db/migrate/20140304015527_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/20140304015530_create_tournaments.rb b/db/migrate/20140304015530_create_tournaments.rb new file mode 100644 index 0000000..36fcf7e --- /dev/null +++ b/db/migrate/20140304015530_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/20140304015532_create_matches.rb b/db/migrate/20140304015532_create_matches.rb new file mode 100644 index 0000000..6c0c157 --- /dev/null +++ b/db/migrate/20140304015532_create_matches.rb @@ -0,0 +1,9 @@ +class CreateMatches < ActiveRecord::Migration + def change + create_table :matches do |t| + t.references :tournament, index: true + + t.timestamps + end + end +end diff --git a/db/migrate/20140304015534_create_teams.rb b/db/migrate/20140304015534_create_teams.rb new file mode 100644 index 0000000..dd8397d --- /dev/null +++ b/db/migrate/20140304015534_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/20140304015538_create_users.rb b/db/migrate/20140304015538_create_users.rb new file mode 100644 index 0000000..f0986d4 --- /dev/null +++ b/db/migrate/20140304015538_create_users.rb @@ -0,0 +1,11 @@ +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/20140304015540_create_user_team_pairs.rb b/db/migrate/20140304015540_create_user_team_pairs.rb new file mode 100644 index 0000000..2c492ac --- /dev/null +++ b/db/migrate/20140304015540_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/20140304015542_create_team_match_pairs.rb b/db/migrate/20140304015542_create_team_match_pairs.rb new file mode 100644 index 0000000..8fac07e --- /dev/null +++ b/db/migrate/20140304015542_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/20140304015544_create_alerts.rb b/db/migrate/20140304015544_create_alerts.rb new file mode 100644 index 0000000..68a8e10 --- /dev/null +++ b/db/migrate/20140304015544_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/20140304015547_create_pms.rb b/db/migrate/20140304015547_create_pms.rb new file mode 100644 index 0000000..93bb5c6 --- /dev/null +++ b/db/migrate/20140304015547_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/20140304015549_create_games.rb b/db/migrate/20140304015549_create_games.rb new file mode 100644 index 0000000..59d4ef0 --- /dev/null +++ b/db/migrate/20140304015549_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/20140304015551_create_game_attributes.rb b/db/migrate/20140304015551_create_game_attributes.rb new file mode 100644 index 0000000..b63f134 --- /dev/null +++ b/db/migrate/20140304015551_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/20140304015553_create_server_settings.rb b/db/migrate/20140304015553_create_server_settings.rb new file mode 100644 index 0000000..dfdd91b --- /dev/null +++ b/db/migrate/20140304015553_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/20140304015559_create_tournament_options.rb b/db/migrate/20140304015559_create_tournament_options.rb new file mode 100644 index 0000000..d2df22e --- /dev/null +++ b/db/migrate/20140304015559_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 41dac9e..7d4d50e 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: 20140304015517) do +ActiveRecord::Schema.define(version: 20140304015559) do create_table "alerts", force: true do |t| t.integer "author_id" @@ -110,9 +110,9 @@ ActiveRecord::Schema.define(version: 20140304015517) do add_index "user_team_pairs", ["user_id"], name: "index_user_team_pairs_on_user_id" create_table "users", force: true do |t| - t.text "name" - t.text "pw_hash" - t.integer "groups" + t.string "name" + t.string "email" + t.string "user_name" t.datetime "created_at" t.datetime "updated_at" end diff --git a/generate.sh b/generate.sh index 07a7688..2bf027a 100755 --- a/generate.sh +++ b/generate.sh @@ -10,25 +10,27 @@ # To Clear the Generated Files: # git clean -df # +NOTEST='--skip-test-unit' set -x -bundle exec rails generate scaffold server -bundle exec rails generate scaffold tournament game:references -bundle exec rails generate scaffold match tournament:references -bundle exec rails generate scaffold team -bundle exec rails generate scaffold user name:text pw_hash:text groups:integer -bundle exec rails generate model user_team_pair user:references team:references -bundle exec rails generate model team_match_pair team:references match:references -bundle exec rails generate scaffold alert author:references message:text -bundle exec rails generate scaffold pm author:references recipient:references message:text -bundle exec rails generate scaffold game name:text players_per_team:integer teams_per_match:integer set_rounds:integer randomized_teams:integer -bundle exec rails generate model game_attribute game:references key:text type:integer -bundle exec rails generate model server_settings -bundle exec rails generate controller search -bundle exec rails generate controller main +bundle exec rails generate scaffold server $NOTEST +bundle exec rails generate scaffold tournament game:references $NOTEST +bundle exec rails generate scaffold match tournament:references $NOTEST +bundle exec rails generate scaffold team $NOTEST +bundle exec rails generate controller users $NOTEST +bundle exec rails generate model user name:string email:string user_name:string $NOTEST +bundle exec rails generate model user_team_pair user:references team:references $NOTEST +bundle exec rails generate model team_match_pair team:references match:references $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 $NOTEST +bundle exec rails generate model game_attribute game:references key:text type:integer $NOTEST +bundle exec rails generate model server_settings $NOTEST +bundle exec rails generate controller search $NOTEST +bundle exec rails generate controller main $NOTEST #for the tournament controller to generate options -bundle exec rails generate model tournament_options +bundle exec rails generate model tournament_option $NOTEST bundle exec rake db:drop RAILS_ENV=development bundle exec rake db:migrate RAILS_ENV=development 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_option_test.rb b/test/models/tournament_option_test.rb new file mode 100644 index 0000000..8fa9628 --- /dev/null +++ b/test/models/tournament_option_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class TournamentOptionTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/models/tournament_options_test.rb b/test/models/tournament_options_test.rb deleted file mode 100644 index 7677fae..0000000 --- a/test/models/tournament_options_test.rb +++ /dev/null @@ -1,7 +0,0 @@ -require 'test_helper' - -class TournamentOptionsTest < ActiveSupport::TestCase - # test "the truth" do - # assert true - # end -end -- cgit v1.2.3