*All wrestlers without a seed (determined by tournament director) will be assigned a random seed.
- <% if tournament_permissions(@tournament) %>
+ <% if can? :manage, @tournament %>
<%= f.label "Season Wins" %>
<%= f.number_field :season_win %>
diff --git a/app/views/wrestlers/show.html.erb b/app/views/wrestlers/show.html.erb
index aaf5bc1..cb47a00 100644
--- a/app/views/wrestlers/show.html.erb
+++ b/app/views/wrestlers/show.html.erb
@@ -2,7 +2,7 @@
<%= notice %>
<%= link_to "Back to #{@school.name}", "/schools/#{@school.id}", :class=>"btn btn-default" %>
- <% if tournament_permissions(@wrestler.tournament) %>
+ <% if can? :manage, @tournament %>
| <%= link_to "Edit #{@wrestler.name}", edit_wrestler_path(@wrestler), :class=>"btn btn-primary" %>
<% end %>
<% cache ["wrestlers", @wrestler] do %>
diff --git a/db/migrate/20160106025920_create_tournament_delegates.rb b/db/migrate/20160106025920_create_tournament_delegates.rb
new file mode 100644
index 0000000..8e82b12
--- /dev/null
+++ b/db/migrate/20160106025920_create_tournament_delegates.rb
@@ -0,0 +1,10 @@
+class CreateTournamentDelegates < ActiveRecord::Migration
+ def change
+ create_table :tournament_delegates do |t|
+ t.integer :user_id
+ t.integer :tournament_id
+
+ t.timestamps null: false
+ end
+ end
+end
diff --git a/db/migrate/20160106031418_create_school_delegates.rb b/db/migrate/20160106031418_create_school_delegates.rb
new file mode 100644
index 0000000..ee15009
--- /dev/null
+++ b/db/migrate/20160106031418_create_school_delegates.rb
@@ -0,0 +1,10 @@
+class CreateSchoolDelegates < ActiveRecord::Migration
+ def change
+ create_table :school_delegates do |t|
+ t.integer :user_id
+ t.integer :school_id
+
+ t.timestamps null: false
+ end
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 4b815fa..2426aa0 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: 20151230164000) do
+ActiveRecord::Schema.define(version: 20160106031418) do
create_table "delayed_jobs", force: :cascade do |t|
t.integer "priority", default: 0, null: false
@@ -64,6 +64,13 @@ ActiveRecord::Schema.define(version: 20151230164000) do
add_index "mats", ["tournament_id"], name: "index_mats_on_tournament_id"
+ create_table "school_delegates", force: :cascade do |t|
+ t.integer "user_id"
+ t.integer "school_id"
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ end
+
create_table "schools", force: :cascade do |t|
t.string "name"
t.datetime "created_at"
@@ -83,6 +90,13 @@ ActiveRecord::Schema.define(version: 20151230164000) do
add_index "teampointadjusts", ["wrestler_id"], name: "index_teampointadjusts_on_wrestler_id"
+ create_table "tournament_delegates", force: :cascade do |t|
+ t.integer "user_id"
+ t.integer "tournament_id"
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ end
+
create_table "tournaments", force: :cascade do |t|
t.string "name"
t.string "address"
diff --git a/test/controllers/admin_controller_test.rb b/test/controllers/admin_controller_test.rb
deleted file mode 100644
index 6afa24b..0000000
--- a/test/controllers/admin_controller_test.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require 'test_helper'
-
-class AdminControllerTest < ActionController::TestCase
- test "the truth" do
- assert true
- end
-end
diff --git a/test/controllers/matches_controller_test.rb b/test/controllers/matches_controller_test.rb
index 6d7cd71..52a58f0 100644
--- a/test/controllers/matches_controller_test.rb
+++ b/test/controllers/matches_controller_test.rb
@@ -24,6 +24,10 @@ class MatchesControllerTest < ActionController::TestCase
def sign_in_non_owner
sign_in users(:two)
end
+
+ def sign_in_tournament_delegate
+ sign_in users(:three)
+ end
def success
assert_response :success
@@ -65,11 +69,16 @@ class MatchesControllerTest < ActionController::TestCase
assert_redirected_to '/static_pages/not_allowed'
end
- test "logged in tournament owner should post update match" do
- sign_in_owner
+ test "logged in tournament delegate should get edit match page" do
+ sign_in_tournament_delegate
+ get_edit
+ success
+ end
+
+ test "logged in tournament delegate should post update match" do
+ sign_in_tournament_delegate
post_update
assert_redirected_to mat_path(1)
end
-
end
diff --git a/test/controllers/mats_controller_test.rb b/test/controllers/mats_controller_test.rb
index 0bf557f..4f2f788 100644
--- a/test/controllers/mats_controller_test.rb
+++ b/test/controllers/mats_controller_test.rb
@@ -40,6 +40,10 @@ class MatsControllerTest < ActionController::TestCase
def sign_in_non_owner
sign_in users(:two)
end
+
+ def sign_in_tournament_delegate
+ sign_in users(:three)
+ end
def success
assert_response :success
@@ -62,6 +66,12 @@ class MatsControllerTest < ActionController::TestCase
get_edit
success
end
+
+ test "logged in tournament delegate should get edit mat page" do
+ sign_in_tournament_delegate
+ get_edit
+ success
+ end
test "logged in user should not get edit mat page if not owner" do
sign_in_non_owner
@@ -90,6 +100,12 @@ class MatsControllerTest < ActionController::TestCase
post_update
assert_redirected_to tournament_path(@mat.tournament_id)
end
+
+ test "logged in tournament delegate should post update mat" do
+ sign_in_tournament_delegate
+ post_update
+ assert_redirected_to tournament_path(@mat.tournament_id)
+ end
test "logged in tournament owner can create a new mat" do
sign_in_owner
@@ -98,6 +114,14 @@ class MatsControllerTest < ActionController::TestCase
create
assert_redirected_to tournament_path(@mat.tournament_id)
end
+
+ test "logged in tournament delegate can create a new mat" do
+ sign_in_tournament_delegate
+ new
+ success
+ create
+ assert_redirected_to tournament_path(@mat.tournament_id)
+ end
test "logged in user not tournament owner cannot create a mat" do
sign_in_non_owner
@@ -112,6 +136,12 @@ class MatsControllerTest < ActionController::TestCase
destroy
assert_redirected_to tournament_path(@tournament.id)
end
+
+ test "logged in tournament delegate can destroy a mat" do
+ sign_in_tournament_delegate
+ destroy
+ assert_redirected_to tournament_path(@tournament.id)
+ end
test "logged in user not tournament owner cannot destroy mat" do
sign_in_non_owner
@@ -130,6 +160,12 @@ class MatsControllerTest < ActionController::TestCase
show
success
end
+
+ test "logged in tournament delegate should get show mat" do
+ sign_in_tournament_delegate
+ show
+ success
+ end
#TESTS THAT NEED MATCHES PUT ABOVE THIS
diff --git a/test/controllers/schools_controller_test.rb b/test/controllers/schools_controller_test.rb
index f5c708e..8421c6a 100644
--- a/test/controllers/schools_controller_test.rb
+++ b/test/controllers/schools_controller_test.rb
@@ -36,6 +36,10 @@ class SchoolsControllerTest < ActionController::TestCase
def sign_in_non_owner
sign_in users(:two)
end
+
+ def sign_in_tournament_delegate
+ sign_in users(:three)
+ end
def success
assert_response :success
@@ -50,6 +54,12 @@ class SchoolsControllerTest < ActionController::TestCase
get_edit
success
end
+
+ test "logged in tournament delegate should get edit school page" do
+ sign_in_tournament_delegate
+ get_edit
+ success
+ end
test "logged in user should not get edit school page if not owner" do
sign_in_non_owner
@@ -78,6 +88,12 @@ class SchoolsControllerTest < ActionController::TestCase
post_update
assert_redirected_to tournament_path(@school.tournament_id)
end
+
+ test "logged in tournament delegate should post update school" do
+ sign_in_tournament_delegate
+ post_update
+ assert_redirected_to tournament_path(@school.tournament_id)
+ end
test "logged in tournament owner can create a new school" do
sign_in_owner
@@ -86,6 +102,14 @@ class SchoolsControllerTest < ActionController::TestCase
create
assert_redirected_to tournament_path(@school.tournament_id)
end
+
+ test "logged in tournament delegate can create a new school" do
+ sign_in_tournament_delegate
+ new
+ success
+ create
+ assert_redirected_to tournament_path(@school.tournament_id)
+ end
test "logged in user not tournament owner cannot create a school" do
sign_in_non_owner
@@ -100,6 +124,12 @@ class SchoolsControllerTest < ActionController::TestCase
destroy
assert_redirected_to tournament_path(@tournament.id)
end
+
+ test "logged in tournament delegate can destroy a school" do
+ sign_in_tournament_delegate
+ destroy
+ assert_redirected_to tournament_path(@tournament.id)
+ end
test "logged in user not tournament owner cannot destroy school" do
sign_in_non_owner
diff --git a/test/controllers/tournaments_controller_test.rb b/test/controllers/tournaments_controller_test.rb
index ba147f6..4fc0e6d 100644
--- a/test/controllers/tournaments_controller_test.rb
+++ b/test/controllers/tournaments_controller_test.rb
@@ -25,6 +25,10 @@ include Devise::TestHelpers
def sign_in_non_owner
sign_in users(:two)
end
+
+ def sign_in_delegate
+ sign_in users(:three)
+ end
def success
assert_response :success
@@ -169,5 +173,53 @@ include Devise::TestHelpers
get :bracket, id: 1, weight: 1
no_matches
end
+
+ test "logged in tournament delegate can generate matches" do
+ sign_in_delegate
+ get :generate_matches, id: 1
+ success
+ end
+
+ test "logged in tournament delegate can create custom weights" do
+ sign_in_delegate
+ get :create_custom_weights, id: 1, customValue: 'hs'
+ assert_redirected_to '/tournaments/1'
+ end
+
+ test "logged in tournament delegate can access weigh_ins" do
+ sign_in_delegate
+ get :weigh_in, id: 1
+ success
+ end
+
+ test "logged in tournament delegate can access weigh_in_weight" do
+ sign_in_delegate
+ get :weigh_in, id: 1, weight: 1
+ success
+ end
+
+ test "logged in tournament delegate should get edit tournament page" do
+ sign_in_delegate
+ get_edit
+ success
+ end
+
+ test "logged in tournament delegate can access post weigh_in_weight" do
+ sign_in_delegate
+ post :weigh_in, id: 1, weight: 1, wrestler: @wrestlers
+ end
+
+ test "logged in tournament delegate should post update tournament" do
+ sign_in_delegate
+ post_update
+ assert_redirected_to tournament_path(1)
+ end
+
+
+ test "logged in tournament delegate cannot destroy a tournament" do
+ sign_in_delegate
+ destroy
+ redirect
+ end
end
diff --git a/test/controllers/weights_controller_test.rb b/test/controllers/weights_controller_test.rb
index f1c9518..dd7ea4a 100644
--- a/test/controllers/weights_controller_test.rb
+++ b/test/controllers/weights_controller_test.rb
@@ -36,6 +36,10 @@ class WeightsControllerTest < ActionController::TestCase
def sign_in_non_owner
sign_in users(:two)
end
+
+ def sign_in_tournament_delegate
+ sign_in users(:three)
+ end
def success
assert_response :success
@@ -50,6 +54,12 @@ class WeightsControllerTest < ActionController::TestCase
get_edit
success
end
+
+ test "logged in tournament delegate should get edit weight page" do
+ sign_in_tournament_delegate
+ get_edit
+ success
+ end
test "logged in user should not get edit weight page if not owner" do
sign_in_non_owner
@@ -78,6 +88,12 @@ class WeightsControllerTest < ActionController::TestCase
post_update
assert_redirected_to tournament_path(@weight.tournament_id)
end
+
+ test "logged in tournament delegate should post update weight" do
+ sign_in_tournament_delegate
+ post_update
+ assert_redirected_to tournament_path(@weight.tournament_id)
+ end
test "logged in tournament owner can create a new weight" do
sign_in_owner
@@ -86,6 +102,14 @@ class WeightsControllerTest < ActionController::TestCase
create
assert_redirected_to tournament_path(@weight.tournament_id)
end
+
+ test "logged in tournament delegate can create a new weight" do
+ sign_in_tournament_delegate
+ new
+ success
+ create
+ assert_redirected_to tournament_path(@weight.tournament_id)
+ end
test "logged in user not tournament owner cannot create a weight" do
sign_in_non_owner
@@ -100,6 +124,12 @@ class WeightsControllerTest < ActionController::TestCase
destroy
assert_redirected_to tournament_path(@tournament.id)
end
+
+ test "logged in tournament delegate can destroy a weight" do
+ sign_in_tournament_delegate
+ destroy
+ assert_redirected_to tournament_path(@tournament.id)
+ end
test "logged in user not tournament owner cannot destroy weight" do
sign_in_non_owner
diff --git a/test/controllers/wrestlers_controller_test.rb b/test/controllers/wrestlers_controller_test.rb
index cc171bd..c3c3fa9 100644
--- a/test/controllers/wrestlers_controller_test.rb
+++ b/test/controllers/wrestlers_controller_test.rb
@@ -37,6 +37,10 @@ class WrestlersControllerTest < ActionController::TestCase
def sign_in_non_owner
sign_in users(:two)
end
+
+ def sign_in_tournament_delegate
+ sign_in users(:three)
+ end
def success
assert_response :success
@@ -51,6 +55,12 @@ class WrestlersControllerTest < ActionController::TestCase
get_edit
success
end
+
+ test "logged in tournament delegate should get edit wrestler page" do
+ sign_in_tournament_delegate
+ get_edit
+ success
+ end
test "logged in user should not get edit wrestler page if not owner" do
sign_in_non_owner
@@ -79,6 +89,12 @@ class WrestlersControllerTest < ActionController::TestCase
post_update
assert_redirected_to school_path(@school.id)
end
+
+ test "logged in tournament delegate should post update wrestler" do
+ sign_in_tournament_delegate
+ post_update
+ assert_redirected_to school_path(@school.id)
+ end
test "logged in tournament owner can create a new wrestler" do
sign_in_owner
@@ -87,6 +103,14 @@ class WrestlersControllerTest < ActionController::TestCase
create
assert_redirected_to school_path(@school.id)
end
+
+ test "logged in tournament delegate can create a new wrestler" do
+ sign_in_tournament_delegate
+ new
+ success
+ create
+ assert_redirected_to school_path(@school.id)
+ end
test "logged in user not tournament owner cannot create a wrestler" do
sign_in_non_owner
@@ -101,6 +125,12 @@ class WrestlersControllerTest < ActionController::TestCase
destroy
assert_redirected_to school_path(@school.id)
end
+
+ test "logged in tournament delegate can destroy a wrestler" do
+ sign_in_tournament_delegate
+ destroy
+ assert_redirected_to school_path(@school.id)
+ end
test "logged in user not tournament owner cannot destroy wrestler" do
sign_in_non_owner
diff --git a/test/fixtures/school_delegates.yml b/test/fixtures/school_delegates.yml
new file mode 100644
index 0000000..143b056
--- /dev/null
+++ b/test/fixtures/school_delegates.yml
@@ -0,0 +1,9 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+# one:
+# user_id: 1
+# school_id: 1
+
+# two:
+# user_id: 1
+# school_id: 1
diff --git a/test/fixtures/tournament_delegates.yml b/test/fixtures/tournament_delegates.yml
new file mode 100644
index 0000000..37c6a1b
--- /dev/null
+++ b/test/fixtures/tournament_delegates.yml
@@ -0,0 +1,13 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+# one:
+# user_id: 1
+# tournament_id: 1
+
+# two:
+# user_id: 1
+# tournament_id: 1
+
+one:
+ user_id: 3
+ tournament_id: 1
\ No newline at end of file
diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml
index f96654e..6d8325a 100644
--- a/test/fixtures/users.yml
+++ b/test/fixtures/users.yml
@@ -15,3 +15,7 @@ one:
two:
email: test2@test.com
id: 2
+
+three:
+ email: test3@test.com
+ id: 3
diff --git a/test/models/school_delegate_test.rb b/test/models/school_delegate_test.rb
new file mode 100644
index 0000000..92b6f63
--- /dev/null
+++ b/test/models/school_delegate_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class SchoolDelegateTest < ActiveSupport::TestCase
+ # test "the truth" do
+ # assert true
+ # end
+end
diff --git a/test/models/tournament_delegate_test.rb b/test/models/tournament_delegate_test.rb
new file mode 100644
index 0000000..343a476
--- /dev/null
+++ b/test/models/tournament_delegate_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class TournamentDelegateTest < ActiveSupport::TestCase
+ # test "the truth" do
+ # assert true
+ # end
+end