cafe-grader-web Commit - r293:463e9531da32

cafe-grader-web

Commit `r293:463e9531da32` public

parent | child

Description:

fixed dependency errors in spec

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

r293:463e9531da32 - Sun, 28 Mar 2010 05:36:38 - 6 files changed: 43 inserted, 39 deleted

spec/config_spec_helper.rb created 644 ¶ +20

@@ -0,0 +1,20
	1	+
	2	+ module ConfigSpecHelperMethods
	3	+
	4	+ def find_or_create_and_set_config(key, type, value)
	5	+ c = Configuration.find_by_key(key)
	6	+ c \|\|= Configuration.new(:key => key,
	7	+ :value_type => type)
	8	+ c.value = value
	9	+ c.save!
	10	+ end
	11	+
	12	+ def enable_multicontest
	13	+ find_or_create_and_set_config('system.multicontests','boolean','true')
	14	+ end
	15	+
	16	+ def disable_multicontest
	17	+ find_or_create_and_set_config('system.multicontests','boolean','false')
	18	+ end
	19	+
	20	+ end

app/models/configuration.rb ¶ +1

                   return false if mode=='analysis'
                   return true
                 end
                 def self.task_grading_info
                   if Configuration.task_grading_info_cache==nil
                     read_grading_info
                   end
                   return Configuration.task_grading_info_cache
                 end
                 def self.standard_mode?
                   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('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']
                   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

spec/controllers/main_controller_spec.rb ¶ +3 -18

               require File.dirname(__FILE__) + '/../spec_helper'
+            + require File.dirname(__FILE__) + '/../config_spec_helper'
-            - module ConfigHelperMethods
-            -   def enable_multicontest
-            -     c = Configuration.new(:key => 'system.multicontests',
-            -                           :value_type => 'boolean',
-            -                           :value => 'true')
-            -     c.save
-            -   end
-            -   def disable_multicontest
-            -     c = Configuration.new(:key => 'system.multicontests',
-            -                           :value_type => 'boolean',
-            -                           :value => 'false')
-            -     c.save
-            -   end
-            - end
               describe MainController, "when a user comes to list page" do
                 it "should redirect user to login page when unlogged-in user try to access main/list" do
                   get 'list'
                   response.should redirect_to(:action => 'login')
                 end
               end
               describe MainController, "when a logged in user comes to list page, with multicontests off" do
                 integrate_views
-            -   include ConfigHelperMethods
+            +   include ConfigSpecHelperMethods
                 fixtures :users
                 fixtures :problems
                 fixtures :contests
                 before(:each) do
                   disable_multicontest
                 end
                 it "should list available problems" do
                   john = users(:john)
                   get "list", {}, {:user_id => john.id}
                   response.should render_template 'main/list'
                   response.should have_text(/add/)
                   response.should have_text(/easy_problem/)
                   response.should have_text(/hard_problem/)
                 end
               end
               describe MainController, "when a logged in user comes to list page, with multicontests on" do
                 integrate_views
-            -   include ConfigHelperMethods
+            +   include ConfigSpecHelperMethods
                 fixtures :users
                 fixtures :problems
                 fixtures :contests
                 before(:each) do
                   enable_multicontest
                 end
                 it "should list only available public problems to users with no contest assigned" do
                   john = users(:john)
                   get "list", {}, {:user_id => john.id}
                   response.should render_template('main/list')
                   response.should have_text(/add/)
                   response.should_not have_text(/easy_problem/)
                   response.should_not have_text(/hard_problem/)
                 end
                 it "should list available problems on a specific contest" do
                   james = users(:james)
                   get "list", {}, {:user_id => james.id}
                   response.should render_template('main/list')

spec/controllers/users_controller_spec.rb ¶ +4

               require File.dirname(__FILE__) + '/../spec_helper'
               describe UsersController, "when a new user registers" do
                 before(:each) do
                   # create john
                   @john_info = {:login => 'john',
                     :full_name => 'John John',
                     :email => 'john@space.com'}
                   @john = User.new(@john_info)
                   @john_activation_key = "123456"
                   @john.should_receive(:activation_key).
                     any_number_of_times.
                     and_return(@john_activation_key)
+            +     Configuration.new(:key => 'system.online_registration',
+            +                       :value_type => 'boolean',
+            +                       :value => 'true').save
+            +
                   get :new
                   response.should render_template('users/new')
                 end
                 it "should show the new form again when user information is invalid" do
                   User.should_receive(:new).with(any_args()).and_return(@john)
                   @john.should_receive(:activated=).with(false)
                   @john.should_receive(:valid?).and_return(false)
                   @john.should_not_receive(:save)
                   post :register, :login => @john_info[:login],
                                   :full_name => @john_info[:full_name],
                                   :email => @john_info[:email]
                   response.should render_template('users/new')
                 end
                 it "should create unactivated user and send e-mail with activation key" do
                   User.should_receive(:new).with(any_args()).and_return(@john)
                   @john.should_receive(:activated=).with(false)
                   @john.should_receive(:valid?).and_return(true)
                   @john.should_receive(:save).and_return(true)
                   smtp_mock = mock("smtp")

spec/models/configuration_spec.rb ¶ +6 -6

               require File.dirname(__FILE__) + '/../spec_helper'
-            - describe Configuration do
+            + describe Configuration, "when using cache" do
-            -   # only work with cached configuration
-            -   class Configuration
-            -     @@cache = true
-            -   end
                 before(:each) do
+            +     Configuration.cache = true
                   @int_config = mock(Configuration,
                                      :id => 1,
                                      :key => 'mode',
                                      :value_type => 'integer',
                                      :value => '30')
                   @string_config = mock(Configuration,
                                         :id => 2,
                                         :key => 'title',
                                         :value_type => 'string',
                                         :value => 'Hello')
                   @boolean_config = mock(Configuration,
                                          :id => 3,
                                          :key => 'single_user_mode',
                                          :value_type => 'boolean',
                                          :value => 'true')
                 end
+            +   after(:each) do
+            +     Configuration.cache = false
+            +   end
+            +
                 it "should retrieve int config" do
                   Configuration.should_receive(:find).once.with(:all).
                     and_return([@int_config, @string_config, @boolean_config])
                   Configuration.clear
                   val = Configuration.get('mode')
                   val.should == 30
                 end
                 it "should retrieve boolean config" do
                   Configuration.should_receive(:find).once.with(:all).
                     and_return([@int_config, @string_config, @boolean_config])
                   Configuration.clear
                   val = Configuration.get('single_user_mode')
                   val.should == true
                 end
                 it "should retrieve string config" do
                   Configuration.should_receive(:find).once.with(:all).
                     and_return([@int_config, @string_config, @boolean_config])
                   Configuration.clear
                   val = Configuration.get('title')

spec/models/user_spec.rb ¶ +9 -15

               require File.dirname(__FILE__) + '/../spec_helper'
+            + require File.dirname(__FILE__) + '/../config_spec_helper'
               describe User do
                 before(:each) do
                   @password = "hello"
                   @salt = "123"
                   @john = stub_model(User, :salt => @salt,
                                      :hashed_password => User.encrypt(@password,@salt))
                 end
                 it "should be authenticated if activated" do
                   @john.should_receive(:activated).and_return(true)
                   @john.authenticated?(@password).should == true
                 end
                 it "should not be authenticated if inactivated" do
                   @john.should_receive(:activated).and_return(false)
                   @john.authenticated?(@password).should == false
                 end
                 it "should not be authenticated if incorrect password is provided" do
                   @john.should_receive(:activated).and_return(true)
                   @john.should_receive(:hashed_password).and_return("byebye")
                   @john.authenticated?(@password).should == false
                 it "should be allowed if the time interval is more than 5 mins" do
                   time_now = @time_first_register + 6.minutes
                   Time.stub!(:now).and_return(time_now)
                   @mary_second.enough_time_interval_between_same_email_registrations
                   @mary_second.errors.length.should be_zero
                 end
               end
               describe User, "as a class" do
                 it "should be able to generate random password" do
                   password1 = User.random_password
                   password2 = User.random_password
                   password1.should_not == password2
                 end
               end
               describe User, "when requesting problem description," do
+            +   include ConfigSpecHelperMethods
+            +
                 fixtures :users
                 fixtures :problems
                 before(:each) do
                   @james = users(:james)
                   @john = users(:john)
                   @jack = users(:jack)
                   @add = problems(:one)
                   @easy = problems(:easy)
                   @hard = problems(:hard)
                 end
                 it "should check if a problem is in user's contests" do
                   @james.problem_in_user_contests?(@easy).should be_true
                   @james.problem_in_user_contests?(@hard).should be_false
                   @john.problem_in_user_contests?(@easy).should be_false
                   @john.problem_in_user_contests?(@hard).should be_false
                 end
                 it "should be able to view problem in user's contests, when multicontests is on" do
                   enable_multicontest
                   @james.can_view_problem?(@easy).should be_true
                   @jack.can_view_problem?(@easy).should be_true
                   @jack.can_view_problem?(@hard).should be_true
                 end
                 it "should not be able to view problem not in user's contests, when multicontests is on" do
                   enable_multicontest
+            +     @james.can_view_problem?(@hard).should be_false
+            +   end
+            +
+            +   it "with no assigned contest should not be able to view problem in contests when multicontests is on" do
+            +     enable_multicontest
+            +     @john.can_view_problem?(@add).should be_true
                   @john.can_view_problem?(@easy).should be_false
                   @john.can_view_problem?(@hard).should be_false
-            -     @james.can_view_problem?(@hard).should be_false
                 end
                 it "should be able to view all available problems, when multicontests is off" do
                   disable_multicontest
                   @john.can_view_problem?(@easy).should be_true
                   @john.can_view_problem?(@hard).should be_true
                   @james.can_view_problem?(@easy).should be_true
                   @james.can_view_problem?(@hard).should be_true
                 end
                 it "should be able to view public problems, when multicontests is on" do
                   enable_multicontest
                   @john.can_view_problem?(@add).should be_true
                   @james.can_view_problem?(@add).should be_true
                 end
-            -   def enable_multicontest
-            -     c = Configuration.new(:key => 'system.multicontests',
-            -                           :value_type => 'boolean',
-            -                           :value => 'true')
-            -     c.save
               end
-            -   def disable_multicontest
-            -     c = Configuration.new(:key => 'system.multicontests',
-            -                           :value_type => 'boolean',
-            -                           :value => 'false')
-            -     c.save
-            -   end
-            - end

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

r293:463e9531da32 - Sun, 28 Mar 2010 05:36:38 - 6 files changed: 43 inserted, 39 deleted

Sign in to your account

Commit r293:463e9531da32 public

Author

r293:463e9531da32 - Sun, 28 Mar 2010 05:36:38 - 6 files changed: 43 inserted, 39 deleted

Commit `r293:463e9531da32` public