Description:
start testing add compiler msg pop up
Commit status:
[Not Reviewed]
References:
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Add another comment

r622:54dff44ae178 - - 60 files changed: 59 inserted, 1596 deleted

@@ -0,0 +1,3
1 + :javascript
2 + $("#compiler_msg").html("#{j @submissionhcompiler_msg}")
3 +
@@ -0,0 +1,13
1 + require 'test_helper'
2 +
3 + class LoginTest < ActionDispatch::IntegrationTest
4 + # test "the truth" do
5 + # assert true
6 + # end
7 +
8 + test "login with valid information" do
9 + get root_path
10 + assert_response :success
11 +
12 + end
13 + end
@@ -10,21 +10,20
10 10
11 11 gem 'mysql2'
12 12 gem 'sqlite3'
13 13
14 14 # Gems used only for assets and not required
15 15 # in production environments by default.
16 - group :assets do
17 - gem 'sass-rails'
18 - gem 'coffee-rails'
16 + gem 'sass-rails'
17 + gem 'coffee-rails'
19 18
20 19 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
21 20 # gem 'therubyracer', :platforms => :ruby
22 21
23 - gem 'uglifier'
24 - end
22 + gem 'uglifier'
23 +
25 24
26 25 # gem 'prototype-rails'
27 26
28 27 # To use ActiveModel has_secure_password
29 28 # gem 'bcrypt-ruby', '~> 3.0.0'
30 29
@@ -74,9 +73,6
74 73 gem 'test-unit'
75 74 gem 'will_paginate', '~> 3.0.7'
76 75 gem 'dynamic_form'
77 76 gem 'in_place_editing'
78 77 gem 'verification', :git => 'https://github.com/sikachu/verification.git'
79 78
80 - group :test, :development do
81 - gem 'rspec-rails'
82 - end
@@ -1,13 +1,13
1 1 GIT
2 2 remote: https://github.com/sikachu/verification.git
3 - revision: e6fe084ce16b7b5a4b1cdfca5374d125fd034a0f
3 + revision: ff31697b940d7b0e2ec65f08764215c96104e76d
4 4 specs:
5 5 verification (1.0.3)
6 - actionpack (>= 3.0.0, < 5.0)
7 - activesupport (>= 3.0.0, < 5.0)
6 + actionpack (>= 3.0.0, < 5.1)
7 + activesupport (>= 3.0.0, < 5.1)
8 8
9 9 GEM
10 10 remote: https://rubygems.org/
11 11 specs:
12 12 ace-rails-ap (4.1.1)
13 13 actionmailer (4.2.7.1)
@@ -48,14 +48,14
48 48 activesupport (4.2.7.1)
49 49 i18n (~> 0.7)
50 50 json (~> 1.7, >= 1.7.7)
51 51 minitest (~> 5.1)
52 52 thread_safe (~> 0.3, >= 0.3.4)
53 53 tzinfo (~> 1.1)
54 - arel (6.0.3)
55 - autoprefixer-rails (6.5.3.1)
54 + arel (6.0.4)
55 + autoprefixer-rails (6.6.0)
56 56 execjs
57 57 best_in_place (3.0.3)
58 58 actionpack (>= 3.2)
59 59 railties (>= 3.2)
60 60 bootstrap-sass (3.2.0.2)
61 61 sass (~> 3.2)
@@ -65,15 +65,14
65 65 coffee-rails (4.2.1)
66 66 coffee-script (>= 2.2.0)
67 67 railties (>= 4.0.0, < 5.2.x)
68 68 coffee-script (2.4.1)
69 69 coffee-script-source
70 70 execjs
71 - coffee-script-source (1.11.1)
72 - concurrent-ruby (1.0.2)
73 - diff-lcs (1.2.5)
71 + coffee-script-source (1.12.2)
72 + concurrent-ruby (1.0.4)
74 73 dynamic_form (1.1.4)
75 74 erubis (2.7.0)
76 75 execjs (2.7.0)
77 76 globalid (0.3.7)
78 77 activesupport (>= 4.1.0)
79 78 haml (4.0.7)
@@ -93,19 +92,18
93 92 in_place_editing (1.2.0)
94 93 jquery-countdown-rails (2.0.2)
95 94 jquery-rails (4.2.1)
96 95 rails-dom-testing (>= 1, < 3)
97 96 railties (>= 4.2.0)
98 97 thor (>= 0.14, < 2.0)
99 - jquery-tablesorter (1.23.1)
98 + jquery-tablesorter (1.23.3)
100 99 railties (>= 3.2, < 6)
101 100 jquery-timepicker-addon-rails (1.4.1)
102 101 railties (>= 3.1)
103 - jquery-ui-rails (4.0.3)
104 - jquery-rails
105 - railties (>= 3.1.0)
102 + jquery-ui-rails (6.0.1)
103 + railties (>= 3.2.16)
106 104 json (1.8.3)
107 105 loofah (2.0.3)
108 106 nokogiri (>= 1.5.9)
109 107 mail (2.6.4)
110 108 mime-types (>= 1.16, < 4)
111 109 mime-types (3.1)
@@ -133,15 +131,15
133 131 activesupport (= 4.2.7.1)
134 132 bundler (>= 1.3.0, < 2.0)
135 133 railties (= 4.2.7.1)
136 134 sprockets-rails
137 135 rails-deprecated_sanitizer (1.0.3)
138 136 activesupport (>= 4.2.0.alpha)
139 - rails-dom-testing (1.0.7)
137 + rails-dom-testing (1.0.8)
140 138 activesupport (>= 4.2.0.beta, < 5.0)
141 - nokogiri (~> 1.6.0)
139 + nokogiri (~> 1.6)
142 140 rails-deprecated_sanitizer (>= 1.0.1)
143 141 rails-html-sanitizer (1.0.3)
144 142 loofah (~> 2.0)
145 143 rails_bootstrap_sortable (2.0.1)
146 144 momentjs-rails (>= 2.8.3)
147 145 railties (4.2.7.1)
@@ -149,42 +147,25
149 147 activesupport (= 4.2.7.1)
150 148 rake (>= 0.8.7)
151 149 thor (>= 0.18.1, < 2.0)
152 150 rake (12.0.0)
153 151 rdiscount (2.2.0.1)
154 152 rouge (2.0.7)
155 - rspec-core (3.5.4)
156 - rspec-support (~> 3.5.0)
157 - rspec-expectations (3.5.0)
158 - diff-lcs (>= 1.2.0, < 2.0)
159 - rspec-support (~> 3.5.0)
160 - rspec-mocks (3.5.0)
161 - diff-lcs (>= 1.2.0, < 2.0)
162 - rspec-support (~> 3.5.0)
163 - rspec-rails (3.5.2)
164 - actionpack (>= 3.0)
165 - activesupport (>= 3.0)
166 - railties (>= 3.0)
167 - rspec-core (~> 3.5.0)
168 - rspec-expectations (~> 3.5.0)
169 - rspec-mocks (~> 3.5.0)
170 - rspec-support (~> 3.5.0)
171 - rspec-support (3.5.0)
172 153 ruby_parser (3.8.3)
173 154 sexp_processor (~> 4.1)
174 - sass (3.4.22)
155 + sass (3.4.23)
175 156 sass-rails (5.0.6)
176 157 railties (>= 4.0.0, < 6)
177 158 sass (~> 3.1)
178 159 sprockets (>= 2.8, < 4.0)
179 160 sprockets-rails (>= 2.0, < 4.0)
180 161 tilt (>= 1.1, < 3)
181 162 select2-rails (4.0.3)
182 163 thor (~> 0.14)
183 164 sexp_processor (4.7.0)
184 - sprockets (3.7.0)
165 + sprockets (3.7.1)
185 166 concurrent-ruby (~> 1.0)
186 167 rack (> 1, < 3)
187 168 sprockets-rails (3.2.0)
188 169 actionpack (>= 4.0)
189 170 activesupport (>= 4.0)
190 171 sprockets (>= 3.0.0)
@@ -225,13 +206,12
225 206 momentjs-rails
226 207 mysql2
227 208 rails (~> 4.2.0)
228 209 rails_bootstrap_sortable
229 210 rdiscount
230 211 rouge
231 - rspec-rails
232 212 sass-rails
233 213 select2-rails
234 214 sqlite3
235 215 test-unit
236 216 uglifier
237 217 verification!
@@ -9,13 +9,13
9 9 //
10 10 // WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
11 11 // GO AFTER THE REQUIRES BELOW.
12 12 //
13 13 //= require jquery
14 14 //= require jquery_ujs
15 - //= require jquery.ui.all
15 + //= require jquery-ui
16 16 //= require bootstrap-sprockets
17 17 //= require moment
18 18 //= require bootstrap-sortable
19 19 //= require select2
20 20 //= require ace-rails-ap
21 21 //= require ace/mode-c_cpp
@@ -25,15 +25,12
25 25 //= require ace/mode-javascript
26 26 //= require ace/mode-java
27 27 //= require ace/theme-merbivore
28 28 //= require custom
29 29 //= require jquery.countdown
30 30 //-------------- addition from local_jquery -----------
31 - //= require jquery.ui.datepicker
32 - //= require jquery.ui.slider
33 - //= require jquery-ui-timepicker-addon
34 31 //= require jquery-tablesorter
35 32 //= require best_in_place
36 33 //= require best_in_place.jquery-ui
37 34 //= require brython
38 35
39 36 // since this is after blank line, it is not downloaded
@@ -1,14 +1,4
1 - //= require jquery
2 - //= require jquery_ujs
3 - //= require jquery.ui.all
4 - //= require jquery.ui.datepicker
5 - //= require jquery.ui.slider
6 - //= require jquery-ui-timepicker-addon
7 - //= require jquery-tablesorter
8 - //= require best_in_place
9 - //= require best_in_place.jquery-ui
10 -
11 1 $(document).ready(function() {
12 2 /* Activating Best In Place */
13 3 jQuery(".best_in_place").best_in_place();
14 4 });
@@ -11,17 +11,17
11 11 *
12 12 * // bootstrap says that we should not do this, but @import each file instead
13 13 * # *= require_tree .
14 14 * # *= require_self
15 15 */
16 16
17 - @import "jquery.ui.all";
18 - @import "jquery.ui.core";
19 - @import "jquery.ui.theme";
20 - @import "jquery.ui.datepicker";
21 - @import "jquery.ui.slider";
17 + @import "jquery-ui";
18 + //@import "jquery.ui.core";
19 + //@import "jquery.ui.theme";
20 + //@import "jquery.ui.datepicker";
21 + //@import "jquery.ui.slider";
22 22 @import "jquery-ui-timepicker-addon";
23 23 @import "jquery-tablesorter/theme.metro-dark";
24 24 @import "jquery.countdown";
25 25 @import "tablesorter-theme.cafe";
26 26
27 27 //bootstrap
@@ -33,7 +33,11
33 33 #config.active_record.mass_assignment_sanitizer = :strict // DEPRICATED
34 34
35 35 # Print deprecation notices to the stderr
36 36 config.active_support.deprecation = :stderr
37 37
38 38 config.eager_load = false
39 +
40 + #test order
41 + config.active_support.test_order = :sorted
42 +
39 43 end
@@ -50,12 +50,13
50 50 :key => 'contest.multisites',
51 51 :value_type => 'boolean',
52 52 :default_value => 'false',
53 53 :description => 'If the server is in contest mode and this option is true, on the log in of the admin a menu for site selections is shown.'
54 54 },
55 55
56 + #---------------------------- right --------------------------------
56 57 {
57 58 :key => 'right.user_hall_of_fame',
58 59 :value_type => 'boolean',
59 60 :default_value => 'false',
60 61 :description => 'If true, any user can access hall of fame page.'
61 62 },
@@ -71,12 +72,26
71 72 :key => 'right.user_view_submission',
72 73 :value_type => 'boolean',
73 74 :default_value => 'false',
74 75 :description => 'If true, any user can view submissions of every one.'
75 76 },
76 77
78 + {
79 + :key => 'right.bypass_agreement',
80 + :value_type => 'boolean',
81 + :default_value => 'true',
82 + :description => 'When false, a user must accept usage agreement before login'
83 + },
84 +
85 + {
86 + :key => 'right.heartbeat_response',
87 + :value_type => 'string',
88 + :default_value => 'OK',
89 + :description => 'Heart beat response text'
90 + },
91 +
77 92 # If Configuration['system.online_registration'] is true, the
78 93 # system allows online registration, and will use these
79 94 # information for sending confirmation emails.
80 95 {
81 96 :key => 'system.online_registration.smtp',
82 97 :value_type => 'string',
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
deleted file
You need to be logged in to leave comments. Login now