cafe-grader-web Commit - r294:069c049fbc3a

cafe-grader-web

Commit `r294:069c049fbc3a` public

parent | child

Description:

logs out users after contests changed

Commit status:

[Not Reviewed]

References:

default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

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

                   if not ['add','remove','assign'].include? operation
                     flash[:notice] = 'You did not choose the operation to perform.'
                     redirect_to :action => 'contest_management' and return
                   end
                   lines = params[:login_list]
                   if !lines or lines.blank?
                     flash[:notice] = 'You entered an empty list.'
                     redirect_to :action => 'contest_management' and return
                   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
                 # admin management
                 def admin
                   @admins = User.find(:all).find_all {|user| user.admin? }
                 end
                 def grant_admin
                     u.country = countries[user[:country_id]]
                     u.site = sites[user[:site_id]]
                     u.activated = true
                     u.email = "empty-#{u.login}@none.com"
                     if not u.save
                       @import_log << "Errors\n"
                       u.errors.each { |attr,msg|  @import_log << "#{attr} - #{msg}\n" }
                     end
                   end
                 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

               require 'yaml'
               #
               # This class also contains various login of the system.
               #
               class Configuration < ActiveRecord::Base
                 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
                 cattr_accessor :task_grading_info_cache
                 cattr_accessor :contest_time_str
                 cattr_accessor :contest_time
                 # set @@cache = true to only reload once.
                 Configuration.cache = false
                 Configuration.config_cache = nil
                 Configuration.task_grading_info_cache = nil
                   return get(SYSTEM_MODE_CONF_KEY) == 'standard'
                 end
                 def self.contest_mode?
                   return get(SYSTEM_MODE_CONF_KEY) == 'contest'
                 end
                 def self.indv_contest_mode?
                   return get(SYSTEM_MODE_CONF_KEY) == 'indv-contest'
                 end
                 def self.multicontests?
-            -     g = get('system.multicontests')
+            +     return get(MULTICONTESTS_KEY) == true
-            -     return get('system.multicontests') == true
                 end
                 def self.time_limit_mode?
                   mode = get(SYSTEM_MODE_CONF_KEY)
                   return ((mode == 'contest') or (mode == 'indv-contest'))
                 end
                 def self.analysis_mode?
                   return get(SYSTEM_MODE_CONF_KEY) == 'analysis'
                 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
                   end
                   if Configuration.contest_time_str != contest_time_str
                     Configuration.contest_time_str = contest_time_str
                     if tmatch = /(\d+):(\d+)/.match(contest_time_str)
                       h = tmatch[1].to_i
                       m = tmatch[2].to_i
                       Configuration.contest_time = h.hour + m.minute

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

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

db/seeds.rb ¶ +1 -1

                  },
                  {
                    :key => 'ui.show_score',
                    :value_type => 'boolean',
                    :default_value => 'true'
                  },
                  {
                    :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.'
                  },
                  {
                    :key => 'system.mode',
                    :value_type => 'string',
                    :default_value => 'standard',
                    :description => 'Current modes are "standard", "contest", "indv-contest", and "analysis".'
                  },
                  {
                    :key => 'contest.name',
                    :value_type => 'string',

spec/config_spec_helper.rb ¶ +20 -2

               module ConfigSpecHelperMethods
                 def find_or_create_and_set_config(key, type, value)
                   c = Configuration.find_by_key(key)
                   c ||= Configuration.new(:key => key,
                                           :value_type => type)
                   c.value = value
                   c.save!
                 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,12 +1,14
		1	+ require 'delorean'
		2	+
1	require File.dirname(__FILE__) + '/../spec_helper'	3	require File.dirname(__FILE__) + '/../spec_helper'
2	require File.dirname(__FILE__) + '/../config_spec_helper'	4	require File.dirname(__FILE__) + '/../config_spec_helper'
3		5
4	describe MainController, "when a user comes to list page" do	6	describe MainController, "when a user comes to list page" do
5		7
6	it "should redirect user to login page when unlogged-in user try to access main/list" do	8	it "should redirect user to login page when unlogged-in user try to access main/list" do
7	get 'list'	9	get 'list'
8	response.should redirect_to(:action => 'login')	10	response.should redirect_to(:action => 'login')
9	end	11	end
10		12
11	end	13	end
12		14
@@ -133,12 +135,59
133	response.should redirect_to(:action => 'list')	135	response.should redirect_to(:action => 'list')
134	end	136	end
135		137
136	it "should not let user sees other user's compiler message" do	138	it "should not let user sees other user's compiler message" do
137	get 'compiler_msg', {:id => @submission.id}, {:user_id => 2}	139	get 'compiler_msg', {:id => @submission.id}, {:user_id => 2}
138	flash[:notice].should =~ /[Ee]rror/	140	flash[:notice].should =~ /[Ee]rror/
139	response.should redirect_to(:action => 'list')	141	response.should redirect_to(:action => 'list')
140	end	142	end
141		143
142	end	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

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

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

test/fixtures/users.yml ¶ +4

               <%
               User.public_class_method :encrypt
               salt = "abc"
               %>
               john:
                 login: john
                 full_name: john
                 hashed_password: <%= User.encrypt("hello",salt) %>
                 salt: <%= salt %>
+            +   activated: true
               mary:
                 login: mary
                 full_name: mary
                 hashed_password: <%= User.encrypt("goodbye",salt) %>
                 salt: <%= salt %>
                 roles: admin
+            +   activated: true
               james:
                 login: james
                 full_name: James
                 hashed_password: <%= User.encrypt("morning",salt) %>
                 salt: <%= salt %>
                 contests: contest_a
+            +   activated: true
               jack:
                 login: jack
                 full_name: 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

Write
Preview

You need to be logged in to leave comments. Login now

	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