cafe-grader-web Commit - r622:54dff44ae178

cafe-grader-web

Commit `r622:54dff44ae178` public

parent | child

Description:

start testing add compiler msg pop up

Commit status:

[Not Reviewed]

References:

toRails40

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r622:54dff44ae178 - Wed, 28 Dec 2016 09:07:53 - 60 files changed: 59 inserted, 1596 deleted

app/views/submissions/compiler_msg.js.haml created 644 ¶ +3

			@@ -0,0 +1,3
		1	+ :javascript
		2	+ $("#compiler_msg").html("#{j @submissionhcompiler_msg}")
		3	+

test/integration/login_test.rb created 644 ¶ +13

			@@ -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

Gemfile ¶ +4 -8

               gem 'activerecord-session_store'
               gem 'select2-rails'
               # Bundle edge Rails instead:
               # gem 'rails', :git => 'git://github.com/rails/rails.git'
               gem 'mysql2'
               gem 'sqlite3'
               # Gems used only for assets and not required
               # in production environments by default.
-            - group :assets do
-            -   gem 'sass-rails'
-            -   gem 'coffee-rails'
+            + gem 'sass-rails'
+            + gem 'coffee-rails'
                 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
                 # gem 'therubyracer', :platforms => :ruby
-            -   gem 'uglifier'
-            - end
+            + gem 'uglifier'
+            +
               # gem 'prototype-rails'
               # To use ActiveModel has_secure_password
               # gem 'bcrypt-ruby', '~> 3.0.0'
               # To use Jbuilder templates for JSON
               # gem 'jbuilder'
               # Use unicorn as the app server
               # gem 'unicorn'
               gem 'ace-rails-ap'
               gem 'haml'
               gem 'haml-rails'
               gem 'mail'
               gem 'rdiscount'
               gem 'test-unit'
               gem 'will_paginate', '~> 3.0.7'
               gem 'dynamic_form'
               gem 'in_place_editing'
               gem 'verification', :git => 'https://github.com/sikachu/verification.git'
-            - group :test, :development do
-            -   gem 'rspec-rails'
-            - end

Gemfile.lock ¶ +14 -34

               GIT
                 remote: https://github.com/sikachu/verification.git
-            -   revision: e6fe084ce16b7b5a4b1cdfca5374d125fd034a0f
+            +   revision: ff31697b940d7b0e2ec65f08764215c96104e76d
                 specs:
                   verification (1.0.3)
-            -       actionpack (>= 3.0.0, < 5.0)
-            -       activesupport (>= 3.0.0, < 5.0)
+            +       actionpack (>= 3.0.0, < 5.1)
+            +       activesupport (>= 3.0.0, < 5.1)
               GEM
                 remote: https://rubygems.org/
                 specs:
                   ace-rails-ap (4.1.1)
                   actionmailer (4.2.7.1)
                     actionpack (= 4.2.7.1)
                     actionview (= 4.2.7.1)
                     activejob (= 4.2.7.1)
                     mail (~> 2.5, >= 2.5.4)
                     rails-dom-testing (~> 1.0, >= 1.0.5)
                   actionpack (4.2.7.1)
                   activerecord-session_store (1.0.0)
                     actionpack (>= 4.0, < 5.1)
                     activerecord (>= 4.0, < 5.1)
                     multi_json (~> 1.11, >= 1.11.2)
                     rack (>= 1.5.2, < 3)
                     railties (>= 4.0, < 5.1)
                   activesupport (4.2.7.1)
                     i18n (~> 0.7)
                     json (~> 1.7, >= 1.7.7)
                     minitest (~> 5.1)
                     thread_safe (~> 0.3, >= 0.3.4)
                     tzinfo (~> 1.1)
-            -     arel (6.0.3)
-            -     autoprefixer-rails (6.5.3.1)
+            +     arel (6.0.4)
+            +     autoprefixer-rails (6.6.0)
                     execjs
                   best_in_place (3.0.3)
                     actionpack (>= 3.2)
                     railties (>= 3.2)
                   bootstrap-sass (3.2.0.2)
                     sass (~> 3.2)
                   bootstrap-switch-rails (3.3.3)
                   bootstrap-toggle-rails (2.2.1.0)
                   builder (3.2.2)
                   coffee-rails (4.2.1)
                     coffee-script (>= 2.2.0)
                     railties (>= 4.0.0, < 5.2.x)
                   coffee-script (2.4.1)
                     coffee-script-source
                     execjs
-            -     coffee-script-source (1.11.1)
-            -     concurrent-ruby (1.0.2)
-            -     diff-lcs (1.2.5)
+            +     coffee-script-source (1.12.2)
+            +     concurrent-ruby (1.0.4)
                   dynamic_form (1.1.4)
                   erubis (2.7.0)
                   execjs (2.7.0)
                   globalid (0.3.7)
                     activesupport (>= 4.1.0)
                   haml (4.0.7)
                     tilt
                   haml-rails (0.9.0)
                     actionpack (>= 4.0.1)
                     activesupport (>= 4.0.1)
                     haml (>= 4.0.6, < 5.0)
                     html2haml (>= 1.0.1)
                   html2haml (2.0.0)
                     erubis (~> 2.7.0)
                     haml (~> 4.0.0)
                     nokogiri (~> 1.6.0)
                     ruby_parser (~> 3.5)
                   i18n (0.7.0)
                   in_place_editing (1.2.0)
                   jquery-countdown-rails (2.0.2)
                   jquery-rails (4.2.1)
                     rails-dom-testing (>= 1, < 3)
                     railties (>= 4.2.0)
                     thor (>= 0.14, < 2.0)
-            -     jquery-tablesorter (1.23.1)
+            +     jquery-tablesorter (1.23.3)
                     railties (>= 3.2, < 6)
                   jquery-timepicker-addon-rails (1.4.1)
                     railties (>= 3.1)
-            -     jquery-ui-rails (4.0.3)
-            -       jquery-rails
-            -       railties (>= 3.1.0)
+            +     jquery-ui-rails (6.0.1)
+            +       railties (>= 3.2.16)
                   json (1.8.3)
                   loofah (2.0.3)
                     nokogiri (>= 1.5.9)
                   mail (2.6.4)
                     mime-types (>= 1.16, < 4)
                   mime-types (3.1)
                     mime-types-data (~> 3.2015)
                   mime-types-data (3.2016.0521)
                   mini_portile2 (2.1.0)
                   minitest (5.10.1)
                   momentjs-rails (2.15.1)
                     railties (>= 3.1)
                     actionmailer (= 4.2.7.1)
                     actionpack (= 4.2.7.1)
                     actionview (= 4.2.7.1)
                     activejob (= 4.2.7.1)
                     activemodel (= 4.2.7.1)
                     activerecord (= 4.2.7.1)
                     activesupport (= 4.2.7.1)
                     bundler (>= 1.3.0, < 2.0)
                     railties (= 4.2.7.1)
                     sprockets-rails
                   rails-deprecated_sanitizer (1.0.3)
                     activesupport (>= 4.2.0.alpha)
-            -     rails-dom-testing (1.0.7)
+            +     rails-dom-testing (1.0.8)
                     activesupport (>= 4.2.0.beta, < 5.0)
-            -       nokogiri (~> 1.6.0)
+            +       nokogiri (~> 1.6)
                     rails-deprecated_sanitizer (>= 1.0.1)
                   rails-html-sanitizer (1.0.3)
                     loofah (~> 2.0)
                   rails_bootstrap_sortable (2.0.1)
                     momentjs-rails (>= 2.8.3)
                   railties (4.2.7.1)
                     actionpack (= 4.2.7.1)
                     activesupport (= 4.2.7.1)
                     rake (>= 0.8.7)
                     thor (>= 0.18.1, < 2.0)
                   rake (12.0.0)
                   rdiscount (2.2.0.1)
                   rouge (2.0.7)
-            -     rspec-core (3.5.4)
-            -       rspec-support (~> 3.5.0)
-            -     rspec-expectations (3.5.0)
-            -       diff-lcs (>= 1.2.0, < 2.0)
-            -       rspec-support (~> 3.5.0)
-            -     rspec-mocks (3.5.0)
-            -       diff-lcs (>= 1.2.0, < 2.0)
-            -       rspec-support (~> 3.5.0)
-            -     rspec-rails (3.5.2)
-            -       actionpack (>= 3.0)
-            -       activesupport (>= 3.0)
-            -       railties (>= 3.0)
-            -       rspec-core (~> 3.5.0)
-            -       rspec-expectations (~> 3.5.0)
-            -       rspec-mocks (~> 3.5.0)
-            -       rspec-support (~> 3.5.0)
-            -     rspec-support (3.5.0)
                   ruby_parser (3.8.3)
                     sexp_processor (~> 4.1)
-            -     sass (3.4.22)
+            +     sass (3.4.23)
                   sass-rails (5.0.6)
                     railties (>= 4.0.0, < 6)
                     sass (~> 3.1)
                     sprockets (>= 2.8, < 4.0)
                     sprockets-rails (>= 2.0, < 4.0)
                     tilt (>= 1.1, < 3)
                   select2-rails (4.0.3)
                     thor (~> 0.14)
                   sexp_processor (4.7.0)
-            -     sprockets (3.7.0)
+            +     sprockets (3.7.1)
                     concurrent-ruby (~> 1.0)
                     rack (> 1, < 3)
                   sprockets-rails (3.2.0)
                     actionpack (>= 4.0)
                     activesupport (>= 4.0)
                     sprockets (>= 3.0.0)
                   sqlite3 (1.3.12)
                   test-unit (3.2.3)
                     power_assert
                   thor (0.19.4)
                   thread_safe (0.3.5)
                   tilt (2.0.5)
                 jquery-countdown-rails
                 jquery-rails
                 jquery-tablesorter
                 jquery-timepicker-addon-rails
                 jquery-ui-rails
                 mail
                 momentjs-rails
                 mysql2
                 rails (~> 4.2.0)
                 rails_bootstrap_sortable
                 rdiscount
                 rouge
-            -   rspec-rails
                 sass-rails
                 select2-rails
                 sqlite3
                 test-unit
                 uglifier
                 verification!
                 will_paginate (~> 3.0.7)
               BUNDLED WITH
 .13.6

app/assets/javascripts/application.js ¶ +1 -4

               //
               // Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
               // or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
               //
               // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
               // the compiled file.
               //
               // WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
               // GO AFTER THE REQUIRES BELOW.
               //
               //= require jquery
               //= require jquery_ujs
-            - //= require jquery.ui.all
+            + //= require jquery-ui
               //= require bootstrap-sprockets
               //= require moment
               //= require bootstrap-sortable
               //= require select2
               //= require ace-rails-ap
               //= require ace/mode-c_cpp
               //= require ace/mode-python
               //= require ace/mode-ruby
               //= require ace/mode-pascal
               //= require ace/mode-javascript
               //= require ace/mode-java
               //= require ace/theme-merbivore
               //= require custom
               //= require jquery.countdown
               //-------------- addition from local_jquery -----------
-            - //= require jquery.ui.datepicker
-            - //= require jquery.ui.slider
-            - //= require jquery-ui-timepicker-addon
               //= require jquery-tablesorter
               //= require best_in_place
               //= require best_in_place.jquery-ui
               //= require brython
               // since this is after blank line, it is not downloaded
               //x= require prototype
               //x= require prototype_ujs
               //x= require effects
               //x= require dragdrop
               //x= require controls

app/assets/javascripts/local_jquery.js ¶ -10

-            - //= require jquery
-            - //= require jquery_ujs
-            - //= require jquery.ui.all
-            - //= require jquery.ui.datepicker
-            - //= require jquery.ui.slider
-            - //= require jquery-ui-timepicker-addon
-            - //= require jquery-tablesorter
-            - //= require best_in_place
-            - //= require best_in_place.jquery-ui
+            -
-              $(document).ready(function() {
                 /* Activating Best In Place */
                 jQuery(".best_in_place").best_in_place();
               });

app/assets/stylesheets/application.css.scss ¶ +5 -5

                * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
                *
                * You're free to add application-wide styles to this file and they'll appear at the bottom of the
                * compiled file so the styles you add here take precedence over styles defined in any styles
                * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
                * file per style scope.
                *
                * // bootstrap says that we should not do this, but @import each file instead
                * #   *= require_tree .
                * #   *= require_self
                */
-            - @import "jquery.ui.all";
-            - @import "jquery.ui.core";
-            - @import "jquery.ui.theme";
-            - @import "jquery.ui.datepicker";
-            - @import "jquery.ui.slider";
+            + @import "jquery-ui";
+            + //@import "jquery.ui.core";
+            + //@import "jquery.ui.theme";
+            + //@import "jquery.ui.datepicker";
+            + //@import "jquery.ui.slider";
               @import "jquery-ui-timepicker-addon";
               @import "jquery-tablesorter/theme.metro-dark";
               @import "jquery.countdown";
               @import "tablesorter-theme.cafe";
               //bootstrap
               @import "bootstrap-sprockets";
               @import "bootstrap";
               @import "select2";
               @import "select2-bootstrap";
               //@import bootstrap3-switch

config/environments/test.rb ¶ +4

                 # Tell Action Mailer not to deliver emails to the real world.
                 # The :test delivery method accumulates sent emails in the
                 # ActionMailer::Base.deliveries array.
                 config.action_mailer.delivery_method = :test
                 # Raise exception on mass assignment protection for Active Record models
                 #config.active_record.mass_assignment_sanitizer = :strict // DEPRICATED
                 # Print deprecation notices to the stderr
                 config.active_support.deprecation = :stderr
                 config.eager_load = false
+            +
+            +   #test order
+            +   config.active_support.test_order = :sorted
+            +
               end

db/seeds.rb ¶ +15

                    :value_type => 'string',
                    :default_value => 'Grader',
                    :description => 'This name will be shown on the user header bar.'
                  },
                  {
                    :key => 'contest.multisites',
                    :value_type => 'boolean',
                    :default_value => 'false',
                    :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.'
                  },
+            +    #---------------------------- right --------------------------------
                  {
                    :key => 'right.user_hall_of_fame',
                    :value_type => 'boolean',
                    :default_value => 'false',
                    :description => 'If true, any user can access hall of fame page.'
                  },
                  {
                    :key => 'right.multiple_ip_login',
                    :value_type => 'boolean',
                    :default_value => 'true',
                    :description => 'When change from true to false, a user can login from the first IP they logged into afterward.'
                  },
                  {
                    :key => 'right.user_view_submission',
                    :value_type => 'boolean',
                    :default_value => 'false',
                    :description => 'If true, any user can view submissions of every one.'
                  },
+            +    {
+            +      :key => 'right.bypass_agreement',
+            +      :value_type => 'boolean',
+            +      :default_value => 'true',
+            +      :description => 'When false, a user must accept usage agreement before login'
+            +    },
+            +
+            +    {
+            +      :key => 'right.heartbeat_response',
+            +      :value_type => 'string',
+            +      :default_value => 'OK',
+            +      :description => 'Heart beat response text'
+            +    },
+            +
                  # If Configuration['system.online_registration'] is true, the
                  # system allows online registration, and will use these
                  # information for sending confirmation emails.
                  {
                    :key => 'system.online_registration.smtp',
                    :value_type => 'string',
                    :default_value => 'smtp.somehost.com'
                  },
                  {
                    :key => 'system.online_registration.from',
                    :value_type => 'string',

spec/config_spec_helper.rb removed ¶ -38

deleted file

spec/controllers/main_controller_spec.rb removed ¶ -193

deleted file

spec/controllers/sources_controller_spec.rb removed ¶ -12

deleted file

spec/controllers/submissions_controller_spec.rb removed ¶ -160

deleted file

spec/controllers/test_controller_spec.rb removed ¶ -28

deleted file

spec/controllers/user_admin_controller_spec.rb removed ¶ -73

deleted file

spec/controllers/users_controller_spec.rb removed ¶ -100

deleted file

spec/helpers/sources_helper_spec.rb removed ¶ -15

deleted file

spec/helpers/submissions_helper_spec.rb removed ¶ -15

deleted file

spec/integration/contest_managements_spec.rb removed ¶ -136

deleted file

spec/models/configuration_spec.rb removed ¶ -95

deleted file

spec/models/login_spec.rb removed ¶ -5

deleted file

spec/models/site_spec.rb removed ¶ -48

deleted file

spec/models/submission_spec.rb removed ¶ -37

deleted file

spec/models/submission_view_logs_spec.rb removed ¶ -5

deleted file

spec/models/test_request_spec.rb removed ¶ -39

deleted file

spec/models/testcases_spec.rb removed ¶ -5

deleted file

spec/models/user_spec.rb removed ¶ -163

deleted file

spec/rcov.opts removed ¶ -2

deleted file

spec/requests/submissions_spec.rb removed ¶ -11

deleted file

spec/routing/submissions_routing_spec.rb removed ¶ -35

deleted file

spec/spec.opts removed ¶ -4

deleted file

spec/spec_helper.rb removed ¶ -38

deleted file

spec/views/sources/direct_edit.html.haml_spec.rb removed ¶ -5

deleted file

spec/views/submissions/edit.html.haml_spec.rb removed ¶ -15

deleted file

spec/views/submissions/index.html.haml_spec.rb removed ¶ -15

deleted file

spec/views/submissions/new.html.haml_spec.rb removed ¶ -15

deleted file

spec/views/submissions/show.html.haml_spec.rb removed ¶ -12

deleted file

test/fixtures/configurations.yml removed ¶ -7

deleted file

test/performance/browsing_test.rb removed ¶ -12

deleted file

test/unit/.gitkeep removed ¶

deleted file

test/unit/announcement_test.rb removed ¶ -8

deleted file

test/unit/configuration_test.rb removed ¶ -8

deleted file

test/unit/contest_test.rb removed ¶ -8

deleted file

test/unit/country_test.rb removed ¶ -8

deleted file

test/unit/description_test.rb removed ¶ -8

deleted file

test/unit/grader_process_test.rb removed ¶ -8

deleted file

test/unit/helpers/contest_management_helper_test.rb removed ¶ -4

deleted file

test/unit/helpers/contests_helper_test.rb removed ¶ -4

deleted file

test/unit/language_test.rb removed ¶ -10

deleted file

test/unit/message_test.rb removed ¶ -8

deleted file

test/unit/problem_test.rb removed ¶ -10

deleted file

test/unit/right_test.rb removed ¶ -10

deleted file

test/unit/role_test.rb removed ¶ -10

deleted file

test/unit/site_test.rb removed ¶ -8

deleted file

test/unit/submission_test.rb removed ¶ -10

deleted file

test/unit/task_test.rb removed ¶ -41

deleted file

test/unit/test_pair_test.rb removed ¶ -8

deleted file

test/unit/test_request_test.rb removed ¶ -8

deleted file

test/unit/user_contest_stat_test.rb removed ¶ -8

deleted file

test/unit/user_test.rb removed ¶ -10

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

r622:54dff44ae178 - Wed, 28 Dec 2016 09:07:53 - 60 files changed: 59 inserted, 1596 deleted

Sign in to your account

Commit r622:54dff44ae178 public

Author

r622:54dff44ae178 - Wed, 28 Dec 2016 09:07:53 - 60 files changed: 59 inserted, 1596 deleted

Commit `r622:54dff44ae178` public