cafe-grader-web Commit - r626:f38d39d4f555

cafe-grader-web

Commit `r626:f38d39d4f555` public

parent | child

Description:

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

r626:f38d39d4f555 - Fri, 06 Jan 2017 09:24:54 - 7 files changed: 35 inserted, 11 deleted

Gemfile ¶ +1 -1

               gem 'jquery-timepicker-addon-rails'
               gem 'jquery-tablesorter'
               gem 'jquery-countdown-rails'
               #syntax highlighter
               gem 'rouge'
               #add bootstrap
               gem 'bootstrap-sass', '~> 3.2.0'
               gem 'bootstrap-switch-rails'
               gem 'bootstrap-toggle-rails'
               gem 'autoprefixer-rails'
               #bootstrap sortable
               gem 'momentjs-rails'
               gem 'rails_bootstrap_sortable'
               #ace editor
               gem 'ace-rails-ap'
               gem 'haml'
               gem 'haml-rails'
               gem 'mail'
               gem 'rdiscount'
-            - gem 'test-unit'
+            + #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'

Gemfile.lock ¶ -4

                     railties (>= 4.2.0)
                     thor (>= 0.14, < 2.0)
                   jquery-tablesorter (1.23.3)
                     railties (>= 3.2, < 6)
                   jquery-timepicker-addon-rails (1.4.1)
                     railties (>= 3.1)
                   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)
                   multi_json (1.12.1)
                   mysql2 (0.4.5)
                   nokogiri (1.6.8.1)
                     mini_portile2 (~> 2.1.0)
-            -     power_assert (0.4.1)
                   rack (1.6.5)
                   rack-test (0.6.3)
                     rack (>= 1.0)
                   rails (4.2.7.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.8)
                     activesupport (>= 4.2.0.beta, < 5.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)
                     thor (>= 0.18.1, < 2.0)
                   rake (12.0.0)
                   rdiscount (2.2.0.1)
                   rouge (2.0.7)
                   ruby_parser (3.8.3)
                     sexp_processor (~> 4.1)
                   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.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)
                   tzinfo (1.2.2)
                     thread_safe (~> 0.1)
                   uglifier (3.0.4)
                     execjs (>= 0.3.0, < 3)
                   will_paginate (3.0.12)
               PLATFORMS
                 ruby
               DEPENDENCIES
                 ace-rails-ap
                 activerecord-session_store
                 autoprefixer-rails
                 best_in_place (~> 3.0.1)
                 bootstrap-sass (~> 3.2.0)
                 bootstrap-switch-rails
                 bootstrap-toggle-rails
                 coffee-rails
                 dynamic_form
                 haml
                 haml-rails
                 in_place_editing
                 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
                 sass-rails
                 select2-rails
                 sqlite3
-            -   test-unit
                 uglifier
                 verification!
                 will_paginate (~> 3.0.7)
               BUNDLED WITH
 .13.6

app/models/grader_configuration.rb ¶ +1

               require 'yaml'
               #
               # This class also contains various login of the system.
               #
               class GraderConfiguration < ActiveRecord::Base
                 SYSTEM_MODE_CONF_KEY = 'system.mode'
                 TEST_REQUEST_EARLY_TIMEOUT_KEY = 'contest.test_request.early_timeout'
                 MULTICONTESTS_KEY = 'system.multicontests'
                 CONTEST_TIME_LIMIT_KEY = 'contest.time_limit'
                 MULTIPLE_IP_LOGIN_KEY = 'right.multiple_ip_login'
                 VIEW_TESTCASE = 'right.view_testcase'
+            +   SINGLE_USER_KEY = 'system.single_user'
                 cattr_accessor :config_cache
                 cattr_accessor :task_grading_info_cache
                 cattr_accessor :contest_time_str
                 cattr_accessor :contest_time
                 GraderConfiguration.config_cache = nil
                 GraderConfiguration.task_grading_info_cache = nil
                 def self.config_cached?
                   (defined? CONFIGURATION_CACHE_ENABLED) and (CONFIGURATION_CACHE_ENABLED)
                 end
                 def self.get(key)
                   if GraderConfiguration.config_cached?
                     if GraderConfiguration.config_cache == nil
                       self.read_config
                     end
                     return GraderConfiguration.config_cache[key]
                   else
                     return GraderConfiguration.read_one_key(key)
                   end
                 end

app/views/main/_login_box.html.haml ¶ +1 -1

               %b= GraderConfiguration['ui.front.welcome_message']
               %br/
               - if !@hidelogin
                 =t 'login.message'
                 %br/
                 %br/
                 - if flash[:notice]
                   %hr/
                   %b= flash[:notice]
                   %hr/
                 %div{ :style => "border: solid 1px gray; padding: 4px; background: #eeeeff;"}
-            -     = form_tag :controller => 'login', :action => 'login' do
+            +     = form_tag login_login_path do
                     %table
                       %tr
                         %td{:align => "right"}
                           ="#{t 'login_label'}:"
                         %td= text_field_tag 'login'
                       %tr
                         %td{:align => "right"}
                           ="#{t 'password_label'}:"
                         %td= password_field_tag
                       - unless GraderConfiguration['right.bypass_agreement']
                         %tr
                           %td{:align => "right"}= check_box_tag 'accept_agree'
                           %td ยอมรับข้อตกลงการใช้งาน
                     = submit_tag t('login.login_submit')
               %br/
               - if GraderConfiguration['system.online_registration']
                 =t 'login.participation'
                 %b
                   = "#{t 'login.please'} "
                   = link_to "#{t 'login.register'}", :controller => :users, :action => :new
                 %br/
                 = link_to "#{t 'login.forget_password'}", :controller => :users, :action => :forget

config/routes.rb ¶ +3

               CafeGrader::Application.routes.draw do
                 get "sources/direct_edit"
                 root :to => 'main#login'
+            +   #logins
+            +   get 'login/login',  to: 'login#login'
+            +
                 resources :contests
                 resources :sites
                 resources :announcements do
                   member do
                     get 'toggle','toggle_front'
                   end
                 end
                 resources :problems do
                   member do
                     get 'toggle'
                     get 'toggle_test'
                     get 'stat'
                     get 'show_testcase'
                   end
                   collection do
                     get 'turn_all_off'
                     get 'turn_all_on'
                     get 'import'
                     get 'manage'
                   end

test/fixtures/users.yml ¶ +4 -4

               # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
               <%
               User.public_class_method :encrypt
               salt = "abc"
               %>
               john:
                 login: john
                 full_name: john
                 hashed_password: <%= User.encrypt("hello",salt) %>
                 salt: <%= salt %>
                 activated: true
-            - mary:
+            + admin:
-            -   login: mary
+            +   login: admin
-            -   full_name: mary
+            +   full_name: admin
-            -   hashed_password: <%= User.encrypt("goodbye",salt) %>
+            +   hashed_password: <%= User.encrypt("admin",salt) %>
                 salt: <%= salt %>
                 roles: admin
                 activated: true
               james:
                 login: james
                 full_name: James
                 hashed_password: <%= User.encrypt("morning",salt) %>
                 salt: <%= salt %>
                 contests: contest_a
                 activated: true
               jack:
                 login: jack
                 full_name: Jack
                 hashed_password: <%= User.encrypt("morning",salt) %>
                 salt: <%= salt %>
                 contests: contest_a, contest_b
                 activated: true

test/integration/login_test.rb ¶ +25 -1

@@ -1,13 +1,37
1	require 'test_helper'	1	require 'test_helper'
2		2
3	class LoginTest < ActionDispatch::IntegrationTest	3	class LoginTest < ActionDispatch::IntegrationTest
4	# test "the truth" do	4	# test "the truth" do
5	# assert true	5	# assert true
6	# end	6	# end
7		7
8	- test "login with valid information" do	8	+ test "login with invalid information" do
		9	+ get root_path
		10	+ assert_response :success
		11	+ post login_login_path, login: "root", password: "hahaha"
		12	+ assert_redirected_to root_path
		13	+ end
		14	+
		15	+ test "normal user login" do
9	get root_path	16	get root_path
10	assert_response :success	17	assert_response :success
		18	+ post login_login_path, {login: "john", password: "hello" }
		19	+ assert_redirected_to main_list_path
		20	+ end
11		21
		22	+ test "normal user login in single_user mode" do
		23	+ GraderConfiguration[GraderConfiguration::SINGLE_USER_KEY] = 'true'
		24	+ get root_path
		25	+ assert_response :success
		26	+ post login_login_path, {login: "john", password: "hello" }
		27	+ assert_redirected_to root_path
		28	+ end
		29	+
		30	+ test "root login in in single_user mode" do
		31	+ GraderConfiguration[GraderConfiguration::SINGLE_USER_KEY] = 'true'
		32	+ get root_path
		33	+ assert_response :success
		34	+ post login_login_path, {login: "admin", password: "admin" }
		35	+ assert_redirected_to main_list_path
12	end	36	end
13	end	37	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

r626:f38d39d4f555 - Fri, 06 Jan 2017 09:24:54 - 7 files changed: 35 inserted, 11 deleted

Sign in to your account

Commit r626:f38d39d4f555 public

Author

r626:f38d39d4f555 - Fri, 06 Jan 2017 09:24:54 - 7 files changed: 35 inserted, 11 deleted

Commit `r626:f38d39d4f555` public