Description:
started cleaning up tests, fixed fixtures loading error, removed error when contest time limit is uninitialized
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
Jittat Fakcharoenphol
-
r275:3720a1af46c5 - - 19 files changed: 76 inserted, 211 deleted
| @@ -324,13 +324,13 | |||
|
|
324 | 324 | :memory_usage => memory_used |
|
|
325 | 325 | } |
|
|
326 | 326 | end |
|
|
327 | 327 | |
|
|
328 | 328 | def update_user_start_time |
|
|
329 | 329 | user = User.find(session[:user_id]) |
|
|
330 |
- |
|
|
|
330 | + user.update_start_time | |
|
|
331 | 331 | end |
|
|
332 | 332 | |
|
|
333 | 333 | def reject_announcement_refresh_when_logged_out |
|
|
334 | 334 | if not session[:user_id] |
|
|
335 | 335 | render :text => 'Access forbidden', :status => 403 |
|
|
336 | 336 | end |
| @@ -5,24 +5,30 | |||
|
|
5 | 5 | # |
|
|
6 | 6 | class Configuration < ActiveRecord::Base |
|
|
7 | 7 | |
|
|
8 | 8 | SYSTEM_MODE_CONF_KEY = 'system.mode' |
|
|
9 | 9 | TEST_REQUEST_EARLY_TIMEOUT_KEY = 'contest.test_request.early_timeout' |
|
|
10 | 10 | |
|
|
11 | - # set @@cache = true to only reload once. | |
|
|
12 | - @@cache = false | |
|
|
11 | + cattr_accessor :cache | |
|
|
12 | + cattr_accessor :config_cache | |
|
|
13 | + cattr_accessor :task_grading_info | |
|
|
14 | + cattr_accessor :contest_time_str | |
|
|
15 | + cattr_accessor :contest_time | |
|
|
13 | 16 | |
|
|
14 | - @@configurations = nil | |
|
|
15 | - @@task_grading_info = nil | |
|
|
17 | + # set @@cache = true to only reload once. | |
|
|
18 | + Configuration.cache = false | |
|
|
19 | + | |
|
|
20 | + Configuration.config_cache = nil | |
|
|
21 | + Configuration.task_grading_info = nil | |
|
|
16 | 22 | |
|
|
17 | 23 | def self.get(key) |
|
|
18 |
- if |
|
|
|
19 |
- if |
|
|
|
24 | + if Configuration.cache | |
|
|
25 | + if Configuration.config_cache == nil | |
|
|
20 | 26 | self.read_config |
|
|
21 | 27 | end |
|
|
22 |
- return |
|
|
|
28 | + return Configuration.config_cache[key] | |
|
|
23 | 29 | else |
|
|
24 | 30 | return Configuration.read_one_key(key) |
|
|
25 | 31 | end |
|
|
26 | 32 | end |
|
|
27 | 33 | |
|
|
28 | 34 | def self.[](key) |
| @@ -31,21 +37,21 | |||
|
|
31 | 37 | |
|
|
32 | 38 | def self.reload |
|
|
33 | 39 | self.read_config |
|
|
34 | 40 | end |
|
|
35 | 41 | |
|
|
36 | 42 | def self.clear |
|
|
37 |
- |
|
|
|
43 | + Configuration.config_cache = nil | |
|
|
38 | 44 | end |
|
|
39 | 45 | |
|
|
40 | 46 | def self.cache? |
|
|
41 | - @@cache | |
|
|
47 | + Configuration.cache | |
|
|
42 | 48 | end |
|
|
43 | 49 | |
|
|
44 | 50 | def self.enable_caching |
|
|
45 |
- |
|
|
|
51 | + Configuration.cache = true | |
|
|
46 | 52 | end |
|
|
47 | 53 | |
|
|
48 | 54 | # |
|
|
49 | 55 | # View decision |
|
|
50 | 56 | # |
|
|
51 | 57 | def self.show_submitbox_to?(user) |
| @@ -79,16 +85,16 | |||
|
|
79 | 85 | end |
|
|
80 | 86 | return false if mode=='analysis' |
|
|
81 | 87 | return true |
|
|
82 | 88 | end |
|
|
83 | 89 | |
|
|
84 | 90 | def self.task_grading_info |
|
|
85 |
- if |
|
|
|
91 | + if Configuration.task_grading_info==nil | |
|
|
86 | 92 | read_grading_info |
|
|
87 | 93 | end |
|
|
88 |
- return |
|
|
|
94 | + return Configuration.task_grading_info | |
|
|
89 | 95 | end |
|
|
90 | 96 | |
|
|
91 | 97 | def self.standard_mode? |
|
|
92 | 98 | return get(SYSTEM_MODE_CONF_KEY) == 'standard' |
|
|
93 | 99 | end |
|
|
94 | 100 | |
| @@ -109,28 +115,28 | |||
|
|
109 | 115 | return get(SYSTEM_MODE_CONF_KEY) == 'analysis' |
|
|
110 | 116 | end |
|
|
111 | 117 | |
|
|
112 | 118 | def self.contest_time_limit |
|
|
113 | 119 | contest_time_str = Configuration['contest.time_limit'] |
|
|
114 | 120 | |
|
|
115 |
- if not defined? |
|
|
|
116 |
- |
|
|
|
121 | + if not defined? Configuration.contest_time_str | |
|
|
122 | + Configuration.contest_time_str = nil | |
|
|
117 | 123 | end |
|
|
118 | 124 | |
|
|
119 |
- if |
|
|
|
120 |
- |
|
|
|
125 | + if Configuration.contest_time_str != contest_time_str | |
|
|
126 | + Configuration.contest_time_str = contest_time_str | |
|
|
121 | 127 | if tmatch = /(\d+):(\d+)/.match(contest_time_str) |
|
|
122 | 128 | h = tmatch[1].to_i |
|
|
123 | 129 | m = tmatch[2].to_i |
|
|
124 | 130 | |
|
|
125 |
- |
|
|
|
131 | + Configuration.contest_time = h.hour + m.minute | |
|
|
126 | 132 | else |
|
|
127 |
- |
|
|
|
133 | + Configuration.contest_time = nil | |
|
|
128 | 134 | end |
|
|
129 | 135 | end |
|
|
130 |
- return |
|
|
|
136 | + return Configuration.contest_time | |
|
|
131 | 137 | end |
|
|
132 | 138 | |
|
|
133 | 139 | protected |
|
|
134 | 140 | |
|
|
135 | 141 | def self.convert_type(val,type) |
|
|
136 | 142 | case type |
| @@ -143,17 +149,17 | |||
|
|
143 | 149 | when 'boolean' |
|
|
144 | 150 | return (val=='true') |
|
|
145 | 151 | end |
|
|
146 | 152 | end |
|
|
147 | 153 | |
|
|
148 | 154 | def self.read_config |
|
|
149 |
- |
|
|
|
155 | + Configuration.config_cache = {} | |
|
|
150 | 156 | Configuration.find(:all).each do |conf| |
|
|
151 | 157 | key = conf.key |
|
|
152 | 158 | val = conf.value |
|
|
153 |
- |
|
|
|
159 | + Configuration.config_cache[key] = Configuration.convert_type(val,conf.value_type) | |
|
|
154 | 160 | end |
|
|
155 | 161 | end |
|
|
156 | 162 | |
|
|
157 | 163 | def self.read_one_key(key) |
|
|
158 | 164 | conf = Configuration.find_by_key(key) |
|
|
159 | 165 | if conf |
| @@ -162,11 +168,11 | |||
|
|
162 | 168 | return nil |
|
|
163 | 169 | end |
|
|
164 | 170 | end |
|
|
165 | 171 | |
|
|
166 | 172 | def self.read_grading_info |
|
|
167 | 173 | f = File.open(TASK_GRADING_INFO_FILENAME) |
|
|
168 |
- |
|
|
|
174 | + Configuration.task_grading_info = YAML.load(f) | |
|
|
169 | 175 | f.close |
|
|
170 | 176 | end |
|
|
171 | 177 | |
|
|
172 | 178 | end |
| @@ -127,12 +127,15 | |||
|
|
127 | 127 | def contest_time_left |
|
|
128 | 128 | if Configuration.contest_mode? |
|
|
129 | 129 | return nil if site==nil |
|
|
130 | 130 | return site.time_left |
|
|
131 | 131 | elsif Configuration.indv_contest_mode? |
|
|
132 | 132 | time_limit = Configuration.contest_time_limit |
|
|
133 | + if time_limit == nil | |
|
|
134 | + return nil | |
|
|
135 | + end | |
|
|
133 | 136 | if contest_stat==nil |
|
|
134 | 137 | return (Time.now.gmtime + time_limit) - Time.now.gmtime |
|
|
135 | 138 | else |
|
|
136 | 139 | finish_time = contest_stat.started_at + time_limit |
|
|
137 | 140 | current_time = Time.now.gmtime |
|
|
138 | 141 | if current_time > finish_time |
| @@ -167,12 +170,21 | |||
|
|
167 | 170 | return site.started |
|
|
168 | 171 | else |
|
|
169 | 172 | return true |
|
|
170 | 173 | end |
|
|
171 | 174 | end |
|
|
172 | 175 | |
|
|
176 | + def update_start_time | |
|
|
177 | + stat = self.contest_stat | |
|
|
178 | + if stat == nil | |
|
|
179 | + stat = UserContestStat.new(:user => self, | |
|
|
180 | + :started_at => Time.now.gmtime) | |
|
|
181 | + stat.save | |
|
|
182 | + end | |
|
|
183 | + end | |
|
|
184 | + | |
|
|
173 | 185 | protected |
|
|
174 | 186 | def encrypt_new_password |
|
|
175 | 187 | return if password.blank? |
|
|
176 | 188 | self.salt = (10+rand(90)).to_s |
|
|
177 | 189 | self.hashed_password = User.encrypt(self.password,self.salt) |
|
|
178 | 190 | end |
| @@ -1,14 +1,5 | |||
|
|
1 | 1 | class UserContestStat < ActiveRecord::Base |
|
|
2 | 2 | |
|
|
3 | 3 | belongs_to :user |
|
|
4 | 4 | |
|
|
5 | - def self.update_user_start_time(user) | |
|
|
6 | - stat = user.contest_stat | |
|
|
7 | - if stat == nil | |
|
|
8 | - stat = UserContestStat.new(:user => user, | |
|
|
9 | - :started_at => Time.now.gmtime) | |
|
|
10 | - stat.save | |
|
|
11 | - end | |
|
|
12 | - end | |
|
|
13 | - | |
|
|
14 | 5 | end |
| @@ -9,9 +9,9 | |||
|
|
9 | 9 | admin_role.rights << graders_right; |
|
|
10 | 10 | admin_role.save |
|
|
11 | 11 | end |
|
|
12 | 12 | |
|
|
13 | 13 | def self.down |
|
|
14 | 14 | graders_right = Right.find_by_name('graders_admin') |
|
|
15 | - graders_right.destroy | |
|
|
15 | + graders_right.destroy if graders_right | |
|
|
16 | 16 | end |
|
|
17 | 17 | end |
| @@ -21,9 +21,9 | |||
|
|
21 | 21 | end |
|
|
22 | 22 | |
|
|
23 | 23 | def self.down |
|
|
24 | 24 | remove_column :users, :site_id |
|
|
25 | 25 | |
|
|
26 | 26 | default_site = Site.find_by_name('default') |
|
|
27 | - default_site.destroy | |
|
|
27 | + default_site.destroy if default_site | |
|
|
28 | 28 | end |
|
|
29 | 29 | end |
| @@ -98,24 +98,22 | |||
|
|
98 | 98 | t.boolean "replied" |
|
|
99 | 99 | t.datetime "created_at" |
|
|
100 | 100 | t.datetime "updated_at" |
|
|
101 | 101 | end |
|
|
102 | 102 | |
|
|
103 | 103 | create_table "problems", :force => true do |t| |
|
|
104 |
- t.string |
|
|
|
105 |
- t.string |
|
|
|
106 |
- t.integer |
|
|
|
107 |
- t.date |
|
|
|
108 |
- t.boolean |
|
|
|
109 |
- t.string |
|
|
|
110 |
- t.integer |
|
|
|
111 |
- t.boolean |
|
|
|
112 |
- t.boolean |
|
|
|
113 | - t.integer "level", :default => 0 | |
|
|
114 | - t.datetime "updated_at" | |
|
|
115 | - t.string "description_filename" | |
|
|
104 | + t.string "name", :limit => 30 | |
|
|
105 | + t.string "full_name" | |
|
|
106 | + t.integer "full_score" | |
|
|
107 | + t.date "date_added" | |
|
|
108 | + t.boolean "available" | |
|
|
109 | + t.string "url" | |
|
|
110 | + t.integer "description_id" | |
|
|
111 | + t.boolean "test_allowed" | |
|
|
112 | + t.boolean "output_only" | |
|
|
113 | + t.string "description_filename" | |
|
|
116 | 114 | end |
|
|
117 | 115 | |
|
|
118 | 116 | create_table "rights", :force => true do |t| |
|
|
119 | 117 | t.string "name" |
|
|
120 | 118 | t.string "controller" |
|
|
121 | 119 | t.string "action" |
| @@ -207,13 +205,12 | |||
|
|
207 | 205 | create_table "test_pairs", :force => true do |t| |
|
|
208 | 206 | t.integer "problem_id" |
|
|
209 | 207 | t.text "input", :limit => 16777215 |
|
|
210 | 208 | t.text "solution", :limit => 16777215 |
|
|
211 | 209 | t.datetime "created_at" |
|
|
212 | 210 | t.datetime "updated_at" |
|
|
213 | - t.integer "number" | |
|
|
214 | 211 | end |
|
|
215 | 212 | |
|
|
216 | 213 | create_table "test_requests", :force => true do |t| |
|
|
217 | 214 | t.integer "user_id" |
|
|
218 | 215 | t.integer "problem_id" |
|
|
219 | 216 | t.integer "submission_id" |
| @@ -240,32 +237,22 | |||
|
|
240 | 237 | t.datetime "started_at" |
|
|
241 | 238 | t.datetime "created_at" |
|
|
242 | 239 | t.datetime "updated_at" |
|
|
243 | 240 | end |
|
|
244 | 241 | |
|
|
245 | 242 | create_table "users", :force => true do |t| |
|
|
246 |
- t.string "login", |
|
|
|
243 | + t.string "login", :limit => 50 | |
|
|
247 | 244 | t.string "full_name" |
|
|
248 | 245 | t.string "hashed_password" |
|
|
249 |
- t.string "salt", |
|
|
|
246 | + t.string "salt", :limit => 5 | |
|
|
250 | 247 | t.string "alias" |
|
|
251 | 248 | t.string "email" |
|
|
252 | 249 | t.integer "site_id" |
|
|
253 | 250 | t.integer "country_id" |
|
|
254 |
- t.boolean "activated", |
|
|
|
251 | + t.boolean "activated", :default => false | |
|
|
255 | 252 | t.datetime "created_at" |
|
|
256 | 253 | t.datetime "updated_at" |
|
|
257 | - t.string "member1_full_name" | |
|
|
258 | - t.string "member2_full_name" | |
|
|
259 | - t.string "member3_full_name" | |
|
|
260 | - t.boolean "high_school" | |
|
|
261 | - t.string "member1_school_name" | |
|
|
262 | - t.string "member2_school_name" | |
|
|
263 | - t.string "member3_school_name" | |
|
|
264 | - t.string "school_name" | |
|
|
265 | - t.string "province" | |
|
|
266 | - t.integer "year" | |
|
|
267 | 254 | end |
|
|
268 | 255 | |
|
|
269 | 256 | add_index "users", ["login"], :name => "index_users_on_login", :unique => true |
|
|
270 | 257 | |
|
|
271 | 258 | end |
| @@ -22,12 +22,13 | |||
|
|
22 | 22 | response.should redirect_to(:action => 'login') |
|
|
23 | 23 | end |
|
|
24 | 24 | |
|
|
25 | 25 | it "should let user sees her own source" do |
|
|
26 | 26 | Submission.should_receive(:find).with(@submission.id.to_s).and_return(@submission) |
|
|
27 | 27 | User.should_receive(:find).with(1).and_return(@user) |
|
|
28 | + @user.should_receive(:update_start_time) | |
|
|
28 | 29 | get 'source', {:id => @submission.id}, {:user_id => 1} |
|
|
29 | 30 | response.should be_success |
|
|
30 | 31 | end |
|
|
31 | 32 | |
|
|
32 | 33 | it "should let user sees her own compiler message" do |
|
|
33 | 34 | Submission.should_receive(:find).with(@submission.id.to_s).and_return(@submission) |
| @@ -15,13 +15,13 | |||
|
|
15 | 15 | Spec::Runner.configure do |config| |
|
|
16 | 16 | # If you're not using ActiveRecord you should remove these |
|
|
17 | 17 | # lines, delete config/database.yml and disable :active_record |
|
|
18 | 18 | # in your config/boot.rb |
|
|
19 | 19 | config.use_transactional_fixtures = true |
|
|
20 | 20 | config.use_instantiated_fixtures = false |
|
|
21 |
- config.fixture_path = RAILS_ROOT + '/ |
|
|
|
21 | + config.fixture_path = RAILS_ROOT + '/test/fixtures/' | |
|
|
22 | 22 | |
|
|
23 | 23 | # == Fixtures |
|
|
24 | 24 | # |
|
|
25 | 25 | # You can declare fixtures for each example_group like this: |
|
|
26 | 26 | # describe "...." do |
|
|
27 | 27 | # fixtures :table_a, :table_b |
| @@ -1,18 +1,20 | |||
|
|
1 | 1 | # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html |
|
|
2 | 2 | |
|
|
3 | 3 | <% |
|
|
4 | 4 | User.public_class_method :encrypt |
|
|
5 | 5 | |
|
|
6 |
- |
|
|
|
6 | + salt = "abc" | |
|
|
7 | 7 | %> |
|
|
8 | 8 | |
|
|
9 | 9 | john: |
|
|
10 | 10 | login: john |
|
|
11 | - hashed_password: <%= User.encrypt("hello",SALT) %> | |
|
|
12 | - salt: <%= SALT %> | |
|
|
11 | + full_name: john | |
|
|
12 | + hashed_password: <%= User.encrypt("hello",salt) %> | |
|
|
13 | + salt: <%= salt %> | |
|
|
13 | 14 | mary: |
|
|
14 | 15 | login: mary |
|
|
15 | - hashed_password: <%= User.encrypt("goodbye",SALT) %> | |
|
|
16 | - salt: <%= SALT %> | |
|
|
16 | + full_name: mary | |
|
|
17 | + hashed_password: <%= User.encrypt("goodbye",salt) %> | |
|
|
18 | + salt: <%= salt %> | |
|
|
17 | 19 | roles: admin |
|
|
18 | 20 | |
| @@ -1,45 +1,4 | |||
|
|
1 | 1 | require File.dirname(__FILE__) + '/../test_helper' |
|
|
2 | 2 | |
|
|
3 | 3 | class AnnouncementsControllerTest < ActionController::TestCase |
|
|
4 | - def test_should_get_index | |
|
|
5 | - get :index | |
|
|
6 | - assert_response :success | |
|
|
7 | - assert_not_nil assigns(:announcements) | |
|
|
8 | - end | |
|
|
9 | - | |
|
|
10 | - def test_should_get_new | |
|
|
11 | - get :new | |
|
|
12 | - assert_response :success | |
|
|
13 | - end | |
|
|
14 | - | |
|
|
15 | - def test_should_create_announcement | |
|
|
16 | - assert_difference('Announcement.count') do | |
|
|
17 | - post :create, :announcement => { } | |
|
|
18 | - end | |
|
|
19 | - | |
|
|
20 | - assert_redirected_to announcement_path(assigns(:announcement)) | |
|
|
21 | - end | |
|
|
22 | - | |
|
|
23 | - def test_should_show_announcement | |
|
|
24 | - get :show, :id => announcements(:one).id | |
|
|
25 | - assert_response :success | |
|
|
26 | - end | |
|
|
27 | - | |
|
|
28 | - def test_should_get_edit | |
|
|
29 | - get :edit, :id => announcements(:one).id | |
|
|
30 | - assert_response :success | |
|
|
31 | - end | |
|
|
32 | - | |
|
|
33 | - def test_should_update_announcement | |
|
|
34 | - put :update, :id => announcements(:one).id, :announcement => { } | |
|
|
35 | - assert_redirected_to announcement_path(assigns(:announcement)) | |
|
|
36 | - end | |
|
|
37 | - | |
|
|
38 | - def test_should_destroy_announcement | |
|
|
39 | - assert_difference('Announcement.count', -1) do | |
|
|
40 | - delete :destroy, :id => announcements(:one).id | |
|
|
41 | - end | |
|
|
42 | - | |
|
|
43 | - assert_redirected_to announcements_path | |
|
|
44 | - end | |
|
|
45 | 4 | end |
| @@ -1,45 +1,4 | |||
|
|
1 | 1 | require 'test_helper' |
|
|
2 | 2 | |
|
|
3 | 3 | class ContestsControllerTest < ActionController::TestCase |
|
|
4 | - test "should get index" do | |
|
|
5 | - get :index | |
|
|
6 | - assert_response :success | |
|
|
7 | - assert_not_nil assigns(:contests) | |
|
|
8 | - end | |
|
|
9 | - | |
|
|
10 | - test "should get new" do | |
|
|
11 | - get :new | |
|
|
12 | - assert_response :success | |
|
|
13 | - end | |
|
|
14 | - | |
|
|
15 | - test "should create contest" do | |
|
|
16 | - assert_difference('Contest.count') do | |
|
|
17 | - post :create, :contest => { } | |
|
|
18 | - end | |
|
|
19 | - | |
|
|
20 | - assert_redirected_to contest_path(assigns(:contest)) | |
|
|
21 | - end | |
|
|
22 | - | |
|
|
23 | - test "should show contest" do | |
|
|
24 | - get :show, :id => contests(:one).to_param | |
|
|
25 | - assert_response :success | |
|
|
26 | - end | |
|
|
27 | - | |
|
|
28 | - test "should get edit" do | |
|
|
29 | - get :edit, :id => contests(:one).to_param | |
|
|
30 | - assert_response :success | |
|
|
31 | - end | |
|
|
32 | - | |
|
|
33 | - test "should update contest" do | |
|
|
34 | - put :update, :id => contests(:one).to_param, :contest => { } | |
|
|
35 | - assert_redirected_to contest_path(assigns(:contest)) | |
|
|
36 | - end | |
|
|
37 | - | |
|
|
38 | - test "should destroy contest" do | |
|
|
39 | - assert_difference('Contest.count', -1) do | |
|
|
40 | - delete :destroy, :id => contests(:one).to_param | |
|
|
41 | - end | |
|
|
42 | - | |
|
|
43 | - assert_redirected_to contests_path | |
|
|
44 | - end | |
|
|
45 | 4 | end |
| @@ -1,13 +1,13 | |||
|
|
1 | 1 | require File.dirname(__FILE__) + '/../test_helper' |
|
|
2 | 2 | require 'login_controller' |
|
|
3 | 3 | |
|
|
4 | 4 | # Re-raise errors caught by the controller. |
|
|
5 | 5 | class LoginController; def rescue_action(e) raise e end; end |
|
|
6 | 6 | |
|
|
7 |
- class LoginControllerTest < |
|
|
|
7 | + class LoginControllerTest < ActionController::TestCase | |
|
|
8 | 8 | |
|
|
9 | 9 | fixtures :users |
|
|
10 | 10 | |
|
|
11 | 11 | def setup |
|
|
12 | 12 | @controller = LoginController.new |
|
|
13 | 13 | @request = ActionController::TestRequest.new |
| @@ -1,27 +1,15 | |||
|
|
1 | - require File.dirname(__FILE__) + '/../test_helper' | |
|
|
2 | - require 'main_controller' | |
|
|
1 | + require File.dirname(__FILE__) + '/../test_helper' | |
|
|
3 | 2 | |
|
|
4 | - # Re-raise errors caught by the controller. | |
|
|
5 | - class MainController; def rescue_action(e) raise e end; end | |
|
|
6 | - | |
|
|
7 | - class MainControllerTest < Test::Unit::TestCase | |
|
|
8 | - | |
|
|
3 | + class MainControllerTest < ActionController::TestCase | |
|
|
4 | + fixtures :users | |
|
|
9 | 5 | fixtures :problems |
|
|
10 | - fixtures :users | |
|
|
11 | 6 | |
|
|
12 | - def setup | |
|
|
13 | - @controller = MainController.new | |
|
|
14 | - @request = ActionController::TestRequest.new | |
|
|
15 | - @response = ActionController::TestResponse.new | |
|
|
16 | - end | |
|
|
17 | - | |
|
|
18 | - # Replace this with your real tests. | |
|
|
19 | 7 | def test_should_redirect_new_user_to_login |
|
|
20 | 8 | get :list |
|
|
21 | - assert_redirected_to :action => 'login' | |
|
|
9 | + assert_redirected_to :controller => 'main', :action => 'login' | |
|
|
22 | 10 | end |
|
|
23 | 11 | |
|
|
24 | 12 | def test_should_list_available_problems_if_logged_in |
|
|
25 | 13 | john = users(:john) |
|
|
26 | 14 | get :list, {}, {:user_id => john.id} |
|
|
27 | 15 | |
| @@ -1,13 +1,13 | |||
|
|
1 | 1 | require File.dirname(__FILE__) + '/../test_helper' |
|
|
2 | 2 | require 'problems_controller' |
|
|
3 | 3 | |
|
|
4 | 4 | # Re-raise errors caught by the controller. |
|
|
5 | 5 | class ProblemsController; def rescue_action(e) raise e end; end |
|
|
6 | 6 | |
|
|
7 |
- class ProblemsControllerTest < |
|
|
|
7 | + class ProblemsControllerTest < ActionController::TestCase | |
|
|
8 | 8 | fixtures :problems |
|
|
9 | 9 | |
|
|
10 | 10 | def setup |
|
|
11 | 11 | @controller = ProblemsController.new |
|
|
12 | 12 | @request = ActionController::TestRequest.new |
|
|
13 | 13 | @response = ActionController::TestResponse.new |
| @@ -1,45 +1,4 | |||
|
|
1 | 1 | require File.dirname(__FILE__) + '/../test_helper' |
|
|
2 | 2 | |
|
|
3 | 3 | class SitesControllerTest < ActionController::TestCase |
|
|
4 | - def test_should_get_index | |
|
|
5 | - get :index | |
|
|
6 | - assert_response :success | |
|
|
7 | - assert_not_nil assigns(:sites) | |
|
|
8 | - end | |
|
|
9 | - | |
|
|
10 | - def test_should_get_new | |
|
|
11 | - get :new | |
|
|
12 | - assert_response :success | |
|
|
13 | - end | |
|
|
14 | - | |
|
|
15 | - def test_should_create_site | |
|
|
16 | - assert_difference('Site.count') do | |
|
|
17 | - post :create, :site => { } | |
|
|
18 | - end | |
|
|
19 | - | |
|
|
20 | - assert_redirected_to site_path(assigns(:site)) | |
|
|
21 | - end | |
|
|
22 | - | |
|
|
23 | - def test_should_show_site | |
|
|
24 | - get :show, :id => sites(:one).id | |
|
|
25 | - assert_response :success | |
|
|
26 | - end | |
|
|
27 | - | |
|
|
28 | - def test_should_get_edit | |
|
|
29 | - get :edit, :id => sites(:one).id | |
|
|
30 | - assert_response :success | |
|
|
31 | - end | |
|
|
32 | - | |
|
|
33 | - def test_should_update_site | |
|
|
34 | - put :update, :id => sites(:one).id, :site => { } | |
|
|
35 | - assert_redirected_to site_path(assigns(:site)) | |
|
|
36 | - end | |
|
|
37 | - | |
|
|
38 | - def test_should_destroy_site | |
|
|
39 | - assert_difference('Site.count', -1) do | |
|
|
40 | - delete :destroy, :id => sites(:one).id | |
|
|
41 | - end | |
|
|
42 | - | |
|
|
43 | - assert_redirected_to sites_path | |
|
|
44 | - end | |
|
|
45 | 4 | end |
| @@ -1,13 +1,13 | |||
|
|
1 | 1 | require File.dirname(__FILE__) + '/../test_helper' |
|
|
2 | 2 | require 'user_admin_controller' |
|
|
3 | 3 | |
|
|
4 | 4 | # Re-raise errors caught by the controller. |
|
|
5 | 5 | class UserAdminController; def rescue_action(e) raise e end; end |
|
|
6 | 6 | |
|
|
7 |
- class UserAdminControllerTest < |
|
|
|
7 | + class UserAdminControllerTest < ActionController::TestCase | |
|
|
8 | 8 | fixtures :users |
|
|
9 | 9 | fixtures :roles |
|
|
10 | 10 | fixtures :rights |
|
|
11 | 11 | |
|
|
12 | 12 | def setup |
|
|
13 | 13 | @controller = UserAdminController.new |
| @@ -1,13 +1,13 | |||
|
|
1 | 1 | require File.dirname(__FILE__) + '/../test_helper' |
|
|
2 | 2 | require 'users_controller' |
|
|
3 | 3 | |
|
|
4 | 4 | # Re-raise errors caught by the controller. |
|
|
5 | 5 | class UsersController; def rescue_action(e) raise e end; end |
|
|
6 | 6 | |
|
|
7 |
- class UsersControllerTest < |
|
|
|
7 | + class UsersControllerTest < ActionController::TestCase | |
|
|
8 | 8 | def setup |
|
|
9 | 9 | @controller = UsersController.new |
|
|
10 | 10 | @request = ActionController::TestRequest.new |
|
|
11 | 11 | @response = ActionController::TestResponse.new |
|
|
12 | 12 | end |
|
|
13 | 13 | |
| @@ -1,24 +1,25 | |||
|
|
1 | 1 | ENV["RAILS_ENV"] = "test" |
|
|
2 | 2 | require File.expand_path(File.dirname(__FILE__) + "/../config/environment") |
|
|
3 | 3 | require 'test_help' |
|
|
4 | 4 | |
|
|
5 |
- class |
|
|
|
5 | + class ActiveSupport::TestCase | |
|
|
6 | 6 | # Transactional fixtures accelerate your tests by wrapping each test method |
|
|
7 | 7 | # in a transaction that's rolled back on completion. This ensures that the |
|
|
8 | 8 | # test database remains unchanged so your fixtures don't have to be reloaded |
|
|
9 | 9 | # between every test method. Fewer database queries means faster tests. |
|
|
10 | 10 | # |
|
|
11 | 11 | # Read Mike Clark's excellent walkthrough at |
|
|
12 | 12 | # http://clarkware.com/cgi/blosxom/2005/10/24#Rails10FastTesting |
|
|
13 | 13 | # |
|
|
14 | 14 | # Every Active Record database supports transactions except MyISAM tables |
|
|
15 | 15 | # in MySQL. Turn off transactional fixtures in this case; however, if you |
|
|
16 | 16 | # don't care one way or the other, switching from MyISAM to InnoDB tables |
|
|
17 | 17 | # is recommended. |
|
|
18 | - self.use_transactional_fixtures = true | |
|
|
18 | + | |
|
|
19 | + self.use_transactional_fixtures = false | |
|
|
19 | 20 | |
|
|
20 | 21 | # Instantiated fixtures are slow, but give you @david where otherwise you |
|
|
21 | 22 | # would need people(:david). If you don't want to migrate your existing |
|
|
22 | 23 | # test cases which use the @david style and don't mind the speed hit (each |
|
|
23 | 24 | # instantiated fixtures translates to a database query per test method), |
|
|
24 | 25 | # then set this back to true. |
You need to be logged in to leave comments.
Login now