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
@@ -13,15 +13,14
13
13
14 # Gems used only for assets and not required
14 # Gems used only for assets and not required
15 # in production environments by default.
15 # in production environments by default.
16 - group :assets do
16 + gem 'sass-rails'
17 - gem 'sass-rails'
17 + gem 'coffee-rails'
18 - gem 'coffee-rails'
19
18
20 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
19 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
21 # gem 'therubyracer', :platforms => :ruby
20 # gem 'therubyracer', :platforms => :ruby
22
21
23 - gem 'uglifier'
22 + gem 'uglifier'
24 - end
23 +
25
24
26 # gem 'prototype-rails'
25 # gem 'prototype-rails'
27
26
@@ -77,6 +76,3
77 gem 'in_place_editing'
76 gem 'in_place_editing'
78 gem 'verification', :git => 'https://github.com/sikachu/verification.git'
77 gem 'verification', :git => 'https://github.com/sikachu/verification.git'
79
78
80 - group :test, :development do
81 - gem 'rspec-rails'
82 - end
@@ -1,10 +1,10
1 GIT
1 GIT
2 remote: https://github.com/sikachu/verification.git
2 remote: https://github.com/sikachu/verification.git
3 - revision: e6fe084ce16b7b5a4b1cdfca5374d125fd034a0f
3 + revision: ff31697b940d7b0e2ec65f08764215c96104e76d
4 specs:
4 specs:
5 verification (1.0.3)
5 verification (1.0.3)
6 - actionpack (>= 3.0.0, < 5.0)
6 + actionpack (>= 3.0.0, < 5.1)
7 - activesupport (>= 3.0.0, < 5.0)
7 + activesupport (>= 3.0.0, < 5.1)
8
8
9 GEM
9 GEM
10 remote: https://rubygems.org/
10 remote: https://rubygems.org/
@@ -51,8 +51,8
51 minitest (~> 5.1)
51 minitest (~> 5.1)
52 thread_safe (~> 0.3, >= 0.3.4)
52 thread_safe (~> 0.3, >= 0.3.4)
53 tzinfo (~> 1.1)
53 tzinfo (~> 1.1)
54 - arel (6.0.3)
54 + arel (6.0.4)
55 - autoprefixer-rails (6.5.3.1)
55 + autoprefixer-rails (6.6.0)
56 execjs
56 execjs
57 best_in_place (3.0.3)
57 best_in_place (3.0.3)
58 actionpack (>= 3.2)
58 actionpack (>= 3.2)
@@ -68,9 +68,8
68 coffee-script (2.4.1)
68 coffee-script (2.4.1)
69 coffee-script-source
69 coffee-script-source
70 execjs
70 execjs
71 - coffee-script-source (1.11.1)
71 + coffee-script-source (1.12.2)
72 - concurrent-ruby (1.0.2)
72 + concurrent-ruby (1.0.4)
73 - diff-lcs (1.2.5)
74 dynamic_form (1.1.4)
73 dynamic_form (1.1.4)
75 erubis (2.7.0)
74 erubis (2.7.0)
76 execjs (2.7.0)
75 execjs (2.7.0)
@@ -96,13 +95,12
96 rails-dom-testing (>= 1, < 3)
95 rails-dom-testing (>= 1, < 3)
97 railties (>= 4.2.0)
96 railties (>= 4.2.0)
98 thor (>= 0.14, < 2.0)
97 thor (>= 0.14, < 2.0)
99 - jquery-tablesorter (1.23.1)
98 + jquery-tablesorter (1.23.3)
100 railties (>= 3.2, < 6)
99 railties (>= 3.2, < 6)
101 jquery-timepicker-addon-rails (1.4.1)
100 jquery-timepicker-addon-rails (1.4.1)
102 railties (>= 3.1)
101 railties (>= 3.1)
103 - jquery-ui-rails (4.0.3)
102 + jquery-ui-rails (6.0.1)
104 - jquery-rails
103 + railties (>= 3.2.16)
105 - railties (>= 3.1.0)
106 json (1.8.3)
104 json (1.8.3)
107 loofah (2.0.3)
105 loofah (2.0.3)
108 nokogiri (>= 1.5.9)
106 nokogiri (>= 1.5.9)
@@ -136,9 +134,9
136 sprockets-rails
134 sprockets-rails
137 rails-deprecated_sanitizer (1.0.3)
135 rails-deprecated_sanitizer (1.0.3)
138 activesupport (>= 4.2.0.alpha)
136 activesupport (>= 4.2.0.alpha)
139 - rails-dom-testing (1.0.7)
137 + rails-dom-testing (1.0.8)
140 activesupport (>= 4.2.0.beta, < 5.0)
138 activesupport (>= 4.2.0.beta, < 5.0)
141 - nokogiri (~> 1.6.0)
139 + nokogiri (~> 1.6)
142 rails-deprecated_sanitizer (>= 1.0.1)
140 rails-deprecated_sanitizer (>= 1.0.1)
143 rails-html-sanitizer (1.0.3)
141 rails-html-sanitizer (1.0.3)
144 loofah (~> 2.0)
142 loofah (~> 2.0)
@@ -152,26 +150,9
152 rake (12.0.0)
150 rake (12.0.0)
153 rdiscount (2.2.0.1)
151 rdiscount (2.2.0.1)
154 rouge (2.0.7)
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 ruby_parser (3.8.3)
153 ruby_parser (3.8.3)
173 sexp_processor (~> 4.1)
154 sexp_processor (~> 4.1)
174 - sass (3.4.22)
155 + sass (3.4.23)
175 sass-rails (5.0.6)
156 sass-rails (5.0.6)
176 railties (>= 4.0.0, < 6)
157 railties (>= 4.0.0, < 6)
177 sass (~> 3.1)
158 sass (~> 3.1)
@@ -181,7 +162,7
181 select2-rails (4.0.3)
162 select2-rails (4.0.3)
182 thor (~> 0.14)
163 thor (~> 0.14)
183 sexp_processor (4.7.0)
164 sexp_processor (4.7.0)
184 - sprockets (3.7.0)
165 + sprockets (3.7.1)
185 concurrent-ruby (~> 1.0)
166 concurrent-ruby (~> 1.0)
186 rack (> 1, < 3)
167 rack (> 1, < 3)
187 sprockets-rails (3.2.0)
168 sprockets-rails (3.2.0)
@@ -228,7 +209,6
228 rails_bootstrap_sortable
209 rails_bootstrap_sortable
229 rdiscount
210 rdiscount
230 rouge
211 rouge
231 - rspec-rails
232 sass-rails
212 sass-rails
233 select2-rails
213 select2-rails
234 sqlite3
214 sqlite3
@@ -12,7 +12,7
12 //
12 //
13 //= require jquery
13 //= require jquery
14 //= require jquery_ujs
14 //= require jquery_ujs
15 - //= require jquery.ui.all
15 + //= require jquery-ui
16 //= require bootstrap-sprockets
16 //= require bootstrap-sprockets
17 //= require moment
17 //= require moment
18 //= require bootstrap-sortable
18 //= require bootstrap-sortable
@@ -28,9 +28,6
28 //= require custom
28 //= require custom
29 //= require jquery.countdown
29 //= require jquery.countdown
30 //-------------- addition from local_jquery -----------
30 //-------------- addition from local_jquery -----------
31 - //= require jquery.ui.datepicker
32 - //= require jquery.ui.slider
33 - //= require jquery-ui-timepicker-addon
34 //= require jquery-tablesorter
31 //= require jquery-tablesorter
35 //= require best_in_place
32 //= require best_in_place
36 //= require best_in_place.jquery-ui
33 //= require best_in_place.jquery-ui
@@ -1,13 +1,3
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 $(document).ready(function() {
1 $(document).ready(function() {
12 /* Activating Best In Place */
2 /* Activating Best In Place */
13 jQuery(".best_in_place").best_in_place();
3 jQuery(".best_in_place").best_in_place();
@@ -14,11 +14,11
14 * # *= require_self
14 * # *= require_self
15 */
15 */
16
16
17 - @import "jquery.ui.all";
17 + @import "jquery-ui";
18 - @import "jquery.ui.core";
18 + //@import "jquery.ui.core";
19 - @import "jquery.ui.theme";
19 + //@import "jquery.ui.theme";
20 - @import "jquery.ui.datepicker";
20 + //@import "jquery.ui.datepicker";
21 - @import "jquery.ui.slider";
21 + //@import "jquery.ui.slider";
22 @import "jquery-ui-timepicker-addon";
22 @import "jquery-ui-timepicker-addon";
23 @import "jquery-tablesorter/theme.metro-dark";
23 @import "jquery-tablesorter/theme.metro-dark";
24 @import "jquery.countdown";
24 @import "jquery.countdown";
@@ -36,4 +36,8
36 config.active_support.deprecation = :stderr
36 config.active_support.deprecation = :stderr
37
37
38 config.eager_load = false
38 config.eager_load = false
39 +
40 + #test order
41 + config.active_support.test_order = :sorted
42 +
39 end
43 end
@@ -53,6 +53,7
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.'
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 :key => 'right.user_hall_of_fame',
58 :key => 'right.user_hall_of_fame',
58 :value_type => 'boolean',
59 :value_type => 'boolean',
@@ -74,6 +75,20
74 :description => 'If true, any user can view submissions of every one.'
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 # If Configuration['system.online_registration'] is true, the
92 # If Configuration['system.online_registration'] is true, the
78 # system allows online registration, and will use these
93 # system allows online registration, and will use these
79 # information for sending confirmation emails.
94 # information for sending confirmation emails.
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