cafe-grader-web Commit - r294:069c049fbc3a

r294:069c049fbc3a - Sun, 28 Mar 2010 11:18:26 - 22 files changed: 191 inserted, 192 deleted

spec/integration/contest_managements_spec.rb created 644 ¶ +87

			@@ -0,0 +1,87
		1	+ require 'spec_helper'
		2	+ require 'config_spec_helper'
		3	+ require 'delorean'
		4	+
		5	+ describe "ContestManagements" do
		6	+ include ConfigSpecHelperMethods
		7	+
		8	+ fixtures :users
		9	+ fixtures :problems
		10	+ fixtures :contests
		11	+ fixtures :roles
		12	+
		13	+ before(:each) do
		14	+ @admin_user = users(:mary)
		15	+ @contest_b = contests(:contest_b)
		16	+ @james = users(:james)
		17	+ @jack = users(:jack)
		18	+
		19	+ set_contest_time_limit('3:00')
		20	+ set_indv_contest_mode
		21	+ end
		22	+
		23	+ it "should reset users' timer when their contests change" do
		24	+ james_session = open_session
		25	+ james_session.extend(MainSessionMethods)
		26	+
		27	+ james_login_and_get_main_list(james_session)
		28	+ james_session.response.should_not have_text(/OVER/)
		29	+
		30	+ Delorean.time_travel_to(190.minutes.since) do
		31	+ james_session.get_main_list
		32	+ james_session.response.should have_text(/OVER/)
		33	+
		34	+ james_session.get '/' # logout
		35	+ james_session.get '/main/list' # clearly log out
		36	+ james_session.response.should_not render_template 'main/list'
		37	+
		38	+ admin_change_users_contest_to("james", @contest_b, true)
		39	+
		40	+ james_login_and_get_main_list(james_session)
		41	+ james_session.response.should_not have_text(/OVER/)
		42	+ end
		43	+ end
		44	+
		45	+ private
		46	+
		47	+ module MainSessionMethods
		48	+ def login(login_name, password)
		49	+ post '/login/login', :login => login_name, :password => password
		50	+ assert_redirected_to '/main/list'
		51	+ end
		52	+
		53	+ def get_main_list
		54	+ get '/main/list'
		55	+ assert_template 'main/list'
		56	+ end
		57	+ end
		58	+
		59	+ module ContestManagementSessionMethods
		60	+ def change_users_contest_to(user_login_list, contest, reset_timer=false)
		61	+ post_data = {
		62	+ :contest => {:id => contest.id},
		63	+ :operation => 'assign',
		64	+ :login_list => user_login_list
		65	+ }
		66	+ post_data[:reset_timer] = true if reset_timer
		67	+ post '/user_admin/manage_contest', post_data
		68	+ end
		69	+ end
		70	+
		71	+ def admin_change_users_contest_to(user_list, contest, reset_timer)
		72	+ admin_session = open_session
		73	+ admin_session.extend(MainSessionMethods)
		74	+ admin_session.extend(ContestManagementSessionMethods)
		75	+
		76	+ admin_session.login('mary','goodbye')
		77	+ admin_session.get '/main/list'
		78	+ admin_session.change_users_contest_to(user_list, contest, reset_timer)
		79	+ end
		80	+
		81	+ def james_login_and_get_main_list(session)
		82	+ session.login('james', 'morning')
		83	+ session.get_main_list
		84	+ end
		85	+
		86	+ end
		87	+

app/controllers/user_admin_controller.rb ¶ +20 -4

                   end
                   note = []
+            +     user_ids = {}
                   lines.split("\n").each do |line|
-            -       puts line
                     user = User.find_by_login(line.chomp)
-            -       puts user
                     if user
                       if operation=='add'
-            -           user.contests << contest
+            +           if ! user.contests.include? contest
+            +             user.contests << contest
+            +           end
                       elsif operation=='remove'
                         user.contests.delete(contest)
                       else
                         user.contests = [contest]
                       end
+            -
+            +
                       user.contest_stat.destroy if params[:reset_timer]
                       note << user.login
+            +         user_ids[user.id] = true
                     end
                   end
+            +
+            +     if params[:reset_timer]
+            +       logout_users(user_ids)
+            +     end
+            +
                   flash[:notice] = 'User(s) ' + note.join(', ') +
                     ' were successfully modified.  '
                   redirect_to :action => 'contest_management'
                 end
+            +   def logout_users(user_ids)
+            +     sessions = ActiveRecord::SessionStore::Session.find(:all, :conditions => ["updated_at >= ?", 60.minutes.ago])
+            +     sessions.each do |session|
+            +       if user_ids.has_key? session.data[:user_id]
+            +         session.destroy
+            +       end
+            +     end
+            +   end
+            +
               end

app/models/configuration.rb ¶ +4 -3

                 SYSTEM_MODE_CONF_KEY = 'system.mode'
                 TEST_REQUEST_EARLY_TIMEOUT_KEY = 'contest.test_request.early_timeout'
+            +   MULTICONTESTS_KEY = 'system.multicontests'
+            +   CONTEST_TIME_LIMIT_KEY = 'contest.time_limit'
                 cattr_accessor :cache
                 cattr_accessor :config_cache
                 end
                 def self.multicontests?
-            -     g = get('system.multicontests')
-            -     return get('system.multicontests') == true
+            +     return get(MULTICONTESTS_KEY) == true
                 end
                 def self.time_limit_mode?
                 end
                 def self.contest_time_limit
-            -     contest_time_str = Configuration['contest.time_limit']
+            +     contest_time_str = Configuration[CONTEST_TIME_LIMIT_KEY]
                   if not defined? Configuration.contest_time_str
                     Configuration.contest_time_str = nil

app/models/user.rb ¶ +1 -4

                     return false if site==nil
                     return site.finished?
                   elsif Configuration.indv_contest_mode?
-            -       time_limit = Configuration.contest_time_limit
+            -
-            -       return false if contest_stat==nil
+            -
+            +       return false if self.contest_stat(true)==nil
                     return contest_time_left == 0
                   else
                     return false

db/seeds.rb ¶ +1 -1

                    :key => 'contest.time_limit',
                    :value_type => 'string',
                    :default_value => 'unlimited',
-            -      :description => 'Time limit in format hh:mm, or "unlimited" for contests with no time limits.'
+            +      :description => 'Time limit in format hh:mm, or "unlimited" for contests with no time limits.  This config is CACHED.  Restart the server before the change can take effect.'
                  },
                  {

spec/config_spec_helper.rb ¶ +20 -2

                 end
                 def enable_multicontest
-            -     find_or_create_and_set_config('system.multicontests','boolean','true')
+            +     find_or_create_and_set_config(Configuration::MULTICONTESTS_KEY,
+            +                                   'boolean','true')
                 end
                 def disable_multicontest
-            -     find_or_create_and_set_config('system.multicontests','boolean','false')
+            +     find_or_create_and_set_config(Configuration::MULTICONTESTS_KEY,
+            +                                   'boolean','false')
+            +   end
+            +
+            +   def set_indv_contest_mode
+            +     find_or_create_and_set_config(Configuration::SYSTEM_MODE_CONF_KEY,
+            +                                   'string','indv-contest')
                 end
+            +   def set_standard_mode
+            +     find_or_create_and_set_config(Configuration::SYSTEM_MODE_CONF_KEY,
+            +                                   'string','standard')
+            +   end
+            +
+            +   def set_contest_time_limit(limit)
+            +     find_or_create_and_set_config(Configuration::CONTEST_TIME_LIMIT_KEY,
+            +                                   'string',limit)
+            +     # clear old value
+            +     Configuration.contest_time_str = nil
+            +   end
               end

spec/controllers/main_controller_spec.rb ¶ +49

		@@ -1,3 +1,5
	1	+ require 'delorean'
	2	+
1	3	require File.dirname(__FILE__) + '/../spec_helper'
2	4	require File.dirname(__FILE__) + '/../config_spec_helper'
3	5
		@@ -142,3 +144,50
142	144	end
143	145
144	146
	147	+ describe MainController, "during individual contest mode" do
	148	+
	149	+ integrate_views
	150	+
	151	+ include ConfigSpecHelperMethods
	152	+
	153	+ fixtures :users
	154	+ fixtures :problems
	155	+ fixtures :contests
	156	+
	157	+ before(:each) do
	158	+ set_contest_time_limit('3:00') # 3 hours
	159	+ set_indv_contest_mode
	160	+ end
	161	+
	162	+ it "should allow newly login user to see problem list" do
	163	+ john = users(:john)
	164	+ get "list", {}, {:user_id => john.id}
	165	+
	166	+ response.should render_template 'main/list'
	167	+ response.should have_text(/add/)
	168	+ response.should have_text(/easy_problem/)
	169	+ response.should have_text(/hard_problem/)
	170	+ end
	171	+
	172	+ it "should not show 'contest over' sign before the contest ends" do
	173	+ john = users(:john)
	174	+ get "list", {}, {:user_id => john.id}
	175	+
	176	+ Delorean.time_travel_to(179.minutes.since) do
	177	+ get "list", {}, {:user_id => john.id}
	178	+ response.should_not have_text(/OVER/)
	179	+ end
	180	+ end
	181	+
	182	+ it "should show 'contest over' sign after the contest ends" do
	183	+ john = users(:john)
	184	+ get "list", {}, {:user_id => john.id}
	185	+
	186	+ Delorean.time_travel_to(181.minutes.since) do
	187	+ get "list", {}, {:user_id => john.id}
	188	+ response.should have_text(/OVER/)
	189	+ end
	190	+ end
	191	+
	192	+ end
	193	+

test/fixtures/roles.yml ¶ +1

               # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
               admin:
+            +   name: admin
                 rights: graders_right, user_admin_right, problems_right
  No newline at end of file

test/fixtures/sites.yml ¶ +4 -4

               # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
-            - one:
-            -   name: MyString
+            + first_site:
+            +   name: First site
                 started: false
                 start_time: 2008-04-09 14:08:28
-            - two:
-            -   name: MyString
+            + second_site:
+            +   name: Second site
                 started: false
                 start_time: 2008-04-09 14:08:28

test/fixtures/users.yml ¶ +4

                 full_name: john
                 hashed_password: <%= User.encrypt("hello",salt) %>
                 salt: <%= salt %>
+            +   activated: true
               mary:
                 login: mary
                 hashed_password: <%= User.encrypt("goodbye",salt) %>
                 salt: <%= salt %>
                 roles: admin
+            +   activated: true
               james:
                 login: james
                 hashed_password: <%= User.encrypt("morning",salt) %>
                 salt: <%= salt %>
                 contests: contest_a
+            +   activated: true
               jack:
                 login: jack
                 hashed_password: <%= User.encrypt("morning",salt) %>
                 salt: <%= salt %>
                 contests: contest_a, contest_b
+            +   activated: true

test/functional/announcements_controller_test.rb removed ¶ -4

deleted file

test/functional/configurations_controller_test.rb removed ¶ -8

deleted file

test/functional/contest_management_controller_test.rb removed ¶ -8

deleted file

test/functional/contests_controller_test.rb removed ¶ -4

deleted file

test/functional/main_controller_test.rb removed ¶ -4

deleted file

test/functional/messages_controller_test.rb removed ¶ -8

deleted file

test/functional/problems_controller_test.rb removed ¶ -92

deleted file

test/functional/site_controller_test.rb removed ¶ -8

deleted file

test/functional/sites_controller_test.rb removed ¶ -4

deleted file

test/functional/tasks_controller_test.rb removed ¶ -8

deleted file

test/functional/test_controller_test.rb removed ¶ -8

deleted file

test/functional/users_controller_test.rb removed ¶ -18

deleted file

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r294:069c049fbc3a - Sun, 28 Mar 2010 11:18:26 - 22 files changed: 191 inserted, 192 deleted

Sign in to your account

Commit r294:069c049fbc3a public

Author

r294:069c049fbc3a - Sun, 28 Mar 2010 11:18:26 - 22 files changed: 191 inserted, 192 deleted

Commit `r294:069c049fbc3a` public