- Title
- <%= f.text_field :title %>
-
- Notes (shown internally, used to organize announcements)
- <%= f.text_field :notes %>
-
- Body
- <%= f.text_area :body %>
-
- Author
- <%= f.text_field :author %>
-
- Published
- <%= f.check_box :published %>
-
- Show on front page?
- <%= f.check_box :frontpage %>
-
- Show only in contest?
- <%= f.check_box :contest_only %>
-
- <%= f.submit "Update" %> -
-<% end %> - -<%= link_to 'Show', @announcement %> | -<%= link_to 'Back', announcements_path %> diff --git a/app/views/application/_submission.html.haml b/app/views/application/_submission.html.haml --- a/app/views/application/_submission.html.haml +++ b/app/views/application/_submission.html.haml @@ -1,8 +1,8 @@ %tr %td{:align => "center"} - = submission_counter+1 - %td{:align => "center"} + = submission.number + %td.text-right = link_to "##{submission.id}", submission_path(submission.id) %td = l submission.submitted_at, format: :long diff --git a/app/views/application/_submission_short.html.haml b/app/views/application/_submission_short.html.haml --- a/app/views/application/_submission_short.html.haml +++ b/app/views/application/_submission_short.html.haml @@ -2,25 +2,25 @@ - if submission.nil? = "-" - else - - if submission.graded_at.nil? + - unless submission.graded_at = t 'main.submitted_at' = format_short_time(submission.submitted_at.localtime) - else - = t 'main.graded_at' - = "#{format_short_time(submission.graded_at.localtime)}, " + %strong= t 'main.graded_at' + = "#{format_short_time(submission.graded_at.localtime)} " + %br - if GraderConfiguration['ui.show_score'] - = t 'main.score' + %strong=t 'main.score' = "#{(submission.points*100/submission.problem.full_score).to_i} " = " [" %tt = submission.grader_comment = "]" + %br + %strong View: - if GraderConfiguration.show_grading_result - = " | " = link_to '[detailed result]', :action => 'result', :id => submission.id - = " | " - = link_to("[#{t 'main.cmp_msg'}]", {:action => 'compiler_msg', :id => submission.id}, {:popup => true}) - = " | " - = link_to("[#{t 'main.src_link'}]",{:action => 'source', :id => submission.id}) - //= " | " - //= link_to "[#{t 'main.submissions_link'}]", main_submission_path(submission.problem.id) + = link_to "#{t 'main.cmp_msg'}", {:action => 'compiler_msg', :id => submission.id}, {popup: true,class: 'btn btn-xs btn-info'} + = link_to "#{t 'main.src_link'}", download_submission_path(submission.id), class: 'btn btn-xs btn-info' + = link_to "#{t 'main.submissions_link'}", problem_submissions_path(problem_id), class: 'btn btn-xs btn-info' + diff --git a/app/views/configurations/index.html.haml b/app/views/configurations/index.html.haml --- a/app/views/configurations/index.html.haml +++ b/app/views/configurations/index.html.haml @@ -3,24 +3,27 @@ %h1 System configuration -%table.info - %tr.info-head - %th Key - %th Type - %th Value - %th Description - - @configurations.each do |conf| - - @grader_configuration = conf - %tr{:class => cycle("info-odd", "info-even")} - %td - /= in_place_editor_field :grader_configuration, :key, {}, :rows=>1 - = @grader_configuration.key - %td - /= in_place_editor_field :grader_configuration, :value_type, {}, :rows=>1 - = @grader_configuration.value_type - %td - = best_in_place @grader_configuration, :value, ok_button: "ok", cancel_button: "cancel" - %td= conf.description +- @group.each do |g| + %h2= g + %table.table.table-striped + %thead + %th{style: 'width: 25%'} Key + %th{style: 'width: 10%'}Type + %th{style: 'width: 15%'} Value + %th Description + - @configurations.each do |conf| + - next if conf.key[0...(conf.key.index('.'))] != g + - @grader_configuration = conf + %tr + %td + /= in_place_editor_field :grader_configuration, :key, {}, :rows=>1 + = @grader_configuration.key + %td + /= in_place_editor_field :grader_configuration, :value_type, {}, :rows=>1 + = @grader_configuration.value_type + %td + = best_in_place @grader_configuration, :value, ok_button: "ok", cancel_button: "cancel" + %td= conf.description - if GraderConfiguration.config_cached? %br/ diff --git a/app/views/graders/list.html.haml b/app/views/graders/list.html.haml --- a/app/views/graders/list.html.haml +++ b/app/views/graders/list.html.haml @@ -54,8 +54,8 @@ - @submission.each do |sub| %tr.inactive %td= link_to sub.id, submission_path(sub.id) - %td= ("" unless sub.user) || link_to sub.try(:user).try(:full_name), stat_user_path(sub.user.id) - %td= ("" unless sub.problem) || link_to sub.try(:problem).try(:full_name), stat_problem_path(sub.problem.id) + %td= ("" unless sub.user) || link_to(sub.try(:user).try(:full_name), stat_user_path(sub.user.id)) + %td= ("" unless sub.problem) || link_to(sub.try(:problem).try(:full_name), stat_problem_path(sub.problem.id)) %td= "#{time_ago_in_words(sub.submitted_at)} ago" %td= sub.graded_at ? "#{time_ago_in_words(sub.graded_at)} ago" : " " %td= sub.grader_comment @@ -72,8 +72,8 @@ - @backlog_submission.each do |sub| %tr.inactive %td= link_to sub.id, submission_path(sub.id) - %td= ("" unless sub.user) || link_to sub.try(:user).try(:full_name), stat_user_path(sub.user.id) - %td= ("" unless sub.problem) || link_to sub.try(:problem).try(:full_name), stat_problem_path(sub.problem.id) + %td= ("" unless sub.user) || link_to( sub.try(:user).try(:full_name), stat_user_path(sub.user.id)) + %td= ("" unless sub.problem) || link_to( sub.try(:problem).try(:full_name), stat_problem_path(sub.problem.id)) %td= "#{time_ago_in_words(sub.submitted_at)} ago" %td= sub.graded_at ? "#{time_ago_in_words(sub.graded_at)} ago" : " " %td= sub.grader_comment diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml --- a/app/views/layouts/_header.html.haml +++ b/app/views/layouts/_header.html.haml @@ -2,20 +2,26 @@ %nav .container-fluid .navbar-header + %button.navbar-toggle.collapsed{ data: {toggle: 'collapse', target: '#navbar-collapse'} } + %span.sr-only Togggle Navigation + %span.icon-bar + %span.icon-bar + %span.icon-bar %a.navbar-brand{href: main_list_path} %span.glyphicon.glyphicon-home MAIN - .collapse.navbar-collapse + .collapse.navbar-collapse#navbar-collapse %ul.nav.navbar-nav + / submission - if (@current_user!=nil) and (GraderConfiguration.show_tasks_to?(@current_user)) - //= add_menu("#{I18n.t 'menu.tasks'}", 'tasks', 'list') %li.dropdown %a.dropdown-toggle{href: '#', data: {toggle:'dropdown'}, aria: {haspopup:"true", expanded:"false"}, role: "button"} = "#{I18n.t 'menu.submissions'}" %span.caret %ul.dropdown-menu - = add_menu("View", 'main', 'submission') + = add_menu("View", 'submissions', 'index') = add_menu("Self Test", 'test', 'index') + / hall of fame - if GraderConfiguration['right.user_hall_of_fame'] = add_menu("#{I18n.t 'menu.hall_of_fame'}", 'report', 'problem_hof') / display MODE button (with countdown in contest mode) @@ -32,6 +38,7 @@ $("#countdown").countdown({until: "+#{@current_user.contest_time_left.to_i}s", layout: 'Time left: {hnn}:{mnn}:{snn}'}); / admin section - if (@current_user!=nil) and (session[:admin]) + / management %li.dropdown %a.dropdown-toggle{href: '#', data: {toggle:'dropdown'}, aria: {haspopup:"true", expanded:"false"}, role: "button"} Manage @@ -47,12 +54,14 @@ %li.divider{role: 'separator'} = add_menu( 'Sites', 'sites', 'index') = add_menu( 'Contests', 'contest_management', 'index') + / report %li.dropdown %a.dropdown-toggle{href: '#', data: {toggle:'dropdown'}, aria: {haspopup:"true", expanded:"false"}, role: "button"} Report %span.caret %ul.dropdown-menu - = add_menu( 'Results', 'report', 'current_score') + = add_menu( 'Current Score', 'report', 'current_score') + = add_menu( 'Score Report', 'report', 'max_score') = add_menu( 'Report', 'report', 'multiple_login') - if (ungraded = Submission.where('graded_at is null').where('submitted_at < ?', 1.minutes.ago).count) > 0 =link_to "#{ungraded} backlogs!", diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -11,5 +11,6 @@ %body = render 'layouts/header' - = content_tag(:p,flash[:notice],class: 'alert alert-success') if flash[:notice]!=nil + /= content_tag(:p,flash[:notice],class: 'alert alert-success') if flash[:notice]!=nil + = flash_messages = yield diff --git a/app/views/main/_login_box.html.haml b/app/views/main/_login_box.html.haml --- a/app/views/main/_login_box.html.haml +++ b/app/views/main/_login_box.html.haml @@ -12,7 +12,7 @@ %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"} diff --git a/app/views/main/_problem.html.haml b/app/views/main/_problem.html.haml --- a/app/views/main/_problem.html.haml +++ b/app/views/main/_problem.html.haml @@ -1,8 +1,12 @@ %tr %td - = "#{problem.name}" + - if @current_user and @current_user.admin? + = link_to problem.name, stat_problem_path(problem) + - else + = "#{problem.name}" %td = "#{problem.full_name}" + %br = link_to_description_if_any "[#{t 'main.problem_desc'}] ".html_safe, problem %td diff --git a/app/views/main/_submission_box.html.haml b/app/views/main/_submission_box.html.haml --- a/app/views/main/_submission_box.html.haml +++ b/app/views/main/_submission_box.html.haml @@ -8,7 +8,7 @@ %li= msg .form-group = label_tag :submission, 'Problem:' - = select 'submission', 'problem_id', [[(t 'main.specified_in_header'),'-1']] + @problems.collect {|p| ["[#{p.name}] #{p.full_name}", p.id]}, {:selected => '-1'}, { class: 'select2 form-control' } + = select 'submission', 'problem_id', [[(t 'main.specified_in_header'),'-1']] + @problems.collect {|p| ["[#{p.name}] #{p.full_name}", p.id]}, {:selected => '-1'}, { class: 'select2 form-control', style: "width: 100%" } .form-group = label_tag :file, 'File:' .input-group diff --git a/app/views/main/_submission_short.html.haml b/app/views/main/_submission_short.html.haml --- a/app/views/main/_submission_short.html.haml +++ b/app/views/main/_submission_short.html.haml @@ -3,14 +3,14 @@ = "-" - else - unless submission.graded_at - =t 'main.submitted_at' + = t 'main.submitted_at' = format_short_time(submission.submitted_at.localtime) - else %strong= t 'main.graded_at' = "#{format_short_time(submission.graded_at.localtime)} " %br - if GraderConfiguration['ui.show_score'] - =t 'main.score' + %strong=t 'main.score' = "#{(submission.points*100/submission.problem.full_score).to_i} " = " [" %tt @@ -20,7 +20,10 @@ %strong View: - if GraderConfiguration.show_grading_result = link_to '[detailed result]', :action => 'result', :id => submission.id - = link_to "#{t 'main.cmp_msg'}", {:action => 'compiler_msg', :id => submission.id}, {popup: true,class: 'btn btn-xs btn-info'} + /= link_to "#{t 'main.cmp_msg'}", {:action => 'compiler_msg', :id => submission.id}, {popup: true,class: 'btn btn-xs btn-info'} + = link_to "#{t 'main.cmp_msg'}", compiler_msg_submission_path(submission.id), {popup: true,remote: true,class: 'btn btn-xs btn-info'} = link_to "#{t 'main.src_link'}",{:action => 'source', :id => submission.id}, class: 'btn btn-xs btn-info' = link_to "#{t 'main.submissions_link'}", problem_submissions_path(problem_id), class: 'btn btn-xs btn-info' + - if GraderConfiguration.show_testcase + = link_to "testcases", show_problem_testcases_path(problem_id), class: 'btn btn-xs btn-info' diff --git a/app/views/main/list.html.haml b/app/views/main/list.html.haml --- a/app/views/main/list.html.haml +++ b/app/views/main/list.html.haml @@ -43,6 +43,7 @@ .panel.panel-info .panel-heading Announcement + = link_to 'Manage', announcements_path, class: 'btn btn-xs btn-default' %ul.list-group = render :partial => 'announcement', :collection => @announcements @@ -50,3 +51,14 @@ = "Announcement.refreshUrl = '#{url_for :controller => 'main', :action => 'announcements'}';" Announcement.registerRefreshEventTimer(); +.modal.fade#compiler{tabindex: -1,role: 'dialog'} + .modal-dialog.modal-lg{role:'document'} + .modal-content + .modal-header + %button.close{type: 'button', data: {dismissed: :modal}, aria: {label: 'close'}} + %span{aria: {hidden: 'true'}, data: {dismiss: 'modal'}} × + %h4 Compiler message + .modal-body + %pre#compiler_msg + .modal-footer + %button.btn.btn-default{type: 'button', data: {dismiss: 'modal'}} Close diff --git a/app/views/main/submission.html.haml b/app/views/main/submission.html.haml deleted file mode 100644 --- a/app/views/main/submission.html.haml +++ /dev/null @@ -1,31 +0,0 @@ -= user_title_bar(@user) - -.panel.panel-info - .panel-heading - Select Problems - .panel-body - .form-inline - = select 'submission', - 'problem_id', - @problems.collect {|p| ["[#{p.name}] #{p.full_name}", main_submission_url(p.id)]}, - { selected: (@problem ? main_submission_url(@problem) : -1) }, - { class: 'select2 form-control'} - %button.btn.btn-primary.btn-sm.go-button#problem_go{data: {source: '#submission_problem_id'}} Go - -- if @problem!=nil - %h2= "Task: #{@problem.full_name} (#{@problem.name})" - -- if @submissions!=nil - - if @submissions.length>0 - %table.table - %thead - %th No. - %th # - %th At - %th Source - %th Result - %th{:width => "300px"} Compiler message - %th - = render :partial => 'submission', :collection => @submissions - - else - No submission diff --git a/app/views/problems/_form.html.erb b/app/views/problems/_form.html.erb deleted file mode 100644 --- a/app/views/problems/_form.html.erb +++ /dev/null @@ -1,54 +0,0 @@ -<%= error_messages_for 'problem' %> - - -
-<%= text_field 'problem', 'name' %>
-<%= text_field 'problem', 'full_name' %>
-<%= text_field 'problem', 'full_score' %>
-<%= date_select 'problem', 'date_added' %>
- -<%= check_box :problem, :available %> - - -<%= check_box :problem, :test_allowed %> - - -<%= check_box :problem, :output_only %> -
- -<%= error_messages_for 'description' %> - -
-<%= text_area :description, :body, :rows => 10, :cols => 80 %>
-<%= select "description", - "markdowned", - [['True',true],['False',false]], - {:selected => (@description) ? @description.markdowned : false } -%>
- -
-<%= text_field 'problem', 'url' %>
Task PDF <%= file_field_tag 'file' %>
- - - diff --git a/app/views/problems/edit.html.erb b/app/views/problems/edit.html.erb deleted file mode 100644 --- a/app/views/problems/edit.html.erb +++ /dev/null @@ -1,9 +0,0 @@ -" do - render - # Run the generator again with the --webrat flag if you want to use webrat matchers - end -end diff --git a/test/concurrent/task_test_setup.rb b/test/concurrent/task_test_setup.rb --- a/test/concurrent/task_test_setup.rb +++ b/test/concurrent/task_test_setup.rb @@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + "/../../config/environment") def clear_all_tasks - Task.find(:all).each do |task| + Task.all.each do |task| task.destroy end end diff --git a/test/concurrent/task_test_teardown.rb b/test/concurrent/task_test_teardown.rb --- a/test/concurrent/task_test_teardown.rb +++ b/test/concurrent/task_test_teardown.rb @@ -2,13 +2,12 @@ require File.expand_path(File.dirname(__FILE__) + "/../../config/environment") def clear_all_tasks - Task.find(:all).each do |task| + Task.all.each do |task| task.destroy end end -puts Task.find(:all, - :conditions => {:status => Task::STATUS_COMPLETE}).length +puts Task.where(status: Task::STATUS_COMPLETE).length clear_all_tasks diff --git a/test/controllers/announcements_controller_test.rb b/test/controllers/announcements_controller_test.rb new file mode 100644 --- /dev/null +++ b/test/controllers/announcements_controller_test.rb @@ -0,0 +1,50 @@ +require 'test_helper' + +class AnnouncementsControllerTest < ActionController::TestCase + setup do + @announcement = announcements(:one) + @request.session[:user_id] = users(:admin).id + end + + test "should get index" do + get :index + assert_response :success + assert_not_nil assigns(:announcements) + end + + test "should get new" do + get :new + assert_response :success + end + + test "should create announcement" do + assert_difference('Announcement.count') do + post :create, announcement: { author: 'aa',body: 'bb', published: true, frontpage: true, title: 'test'} + end + + assert_redirected_to announcement_path(assigns(:announcement)) + end + + test "should show announcement" do + get :show, id: @announcement + assert_response :success + end + + test "should get edit" do + get :edit, id: @announcement + assert_response :success + end + + test "should update announcement" do + patch :update, id: @announcement, announcement: { author: 'aa',body: 'bb', published: true, frontpage: true, title: 'test'} + assert_redirected_to announcement_path(assigns(:announcement)) + end + + test "should destroy announcement" do + assert_difference('Announcement.count', -1) do + delete :destroy, id: @announcement + end + + assert_redirected_to announcements_path + end +end diff --git a/test/controllers/testcases_controller_test.rb b/test/controllers/testcases_controller_test.rb new file mode 100644 --- /dev/null +++ b/test/controllers/testcases_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class TestcasesControllerTest < ActionController::TestCase + setup do + @testcase = testcases(:one) + end +end diff --git a/test/fixtures/configurations.yml b/test/fixtures/configurations.yml deleted file mode 100644 --- a/test/fixtures/configurations.yml +++ /dev/null @@ -1,7 +0,0 @@ -# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html - -# one: -# column: value -# -# two: -# column: value diff --git a/test/fixtures/grader_configurations.yml b/test/fixtures/grader_configurations.yml new file mode 100644 --- /dev/null +++ b/test/fixtures/grader_configurations.yml @@ -0,0 +1,144 @@ +GraderConfiguration_1: + key: system.single_user_mode + value_type: boolean + value: 'false' + description: Only admins can log in to the system when running under single user mode. + +GraderConfiguration_2: + key: ui.front.title + value_type: string + value: Grader + +GraderConfiguration_3: + key: ui.front.welcome_message + value_type: string + value: Welcome! + +GraderConfiguration_4: + key: ui.show_score + value_type: boolean + value: 'true' + +GraderConfiguration_5: + key: contest.time_limit + value_type: string + value: unlimited + description: Time limit in format hh:mm, or "unlimited" for contests with no time + limits. This config is CACHED. Restart the server before the change can take + effect. + +GraderConfiguration_6: + key: system.mode + value_type: string + value: standard + description: Current modes are "standard", "contest", "indv-contest", and "analysis". + + +GraderConfiguration_7: + key: contest.name + value_type: string + value: Grader + description: This name will be shown on the user header bar. + + +GraderConfiguration_8: + key: contest.multisites + value_type: boolean + 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. + + +GraderConfiguration_9: + key: right.user_hall_of_fame + value_type: boolean + value: 'false' + description: If true, any user can access hall of fame page. + + +GraderConfiguration_10: + key: right.multiple_ip_login + value_type: boolean + value: 'true' + description: When change from true to false, a user can login from the first IP + they logged into afterward. + + +GraderConfiguration_11: + key: right.user_view_submission + value_type: boolean + value: 'false' + description: If true, any user can view submissions of every one. + + +GraderConfiguration_12: + key: right.bypass_agreement + value_type: boolean + value: 'true' + description: When false, a user must accept usage agreement before login + + +GraderConfiguration_13: + key: right.heartbeat_response + value_type: string + value: OK + description: Heart beat response text + + +GraderConfiguration_14: + key: right.view_testcase + value_type: boolean + value: 'false' + description: When true, any user can view/download test data + + +GraderConfiguration_15: + key: system.online_registration.smtp + value_type: string + value: smtp.somehost.com + + +GraderConfiguration_16: + key: system.online_registration.from + value_type: string + value: your.email@address + + +GraderConfiguration_17: + key: system.admin_email + value_type: string + value: admin@admin.email + + +GraderConfiguration_18: + key: system.user_setting_enabled + value_type: boolean + value: 'true' + description: If this option is true, users can change their settings + + +GraderConfiguration_19: + key: contest.test_request.early_timeout + value_type: boolean + value: 'false' + + +GraderConfiguration_20: + key: system.multicontests + value_type: boolean + value: 'false' + + +GraderConfiguration_21: + key: contest.confirm_indv_contest_start + value_type: boolean + value: 'false' + + +GraderConfiguration_22: + key: contest.default_contest_name + value_type: string + value: none + description: New user will be assigned to this contest automatically, if it exists. Set + to 'none' if there is no default contest. + diff --git a/test/fixtures/languages.yml b/test/fixtures/languages.yml --- a/test/fixtures/languages.yml +++ b/test/fixtures/languages.yml @@ -1,5 +1,36 @@ -# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html -one: - id: 1 -two: - id: 2 +Language_1: + name: c + pretty_name: C + ext: c + common_ext: c + +Language_2: + name: cpp + pretty_name: C++ + ext: cpp + common_ext: cpp,cc + +Language_3: + name: pas + pretty_name: Pascal + ext: pas + common_ext: pas + +Language_4: + name: ruby + pretty_name: Ruby + ext: rb + common_ext: rb + +Language_5: + name: python + pretty_name: Python + ext: py + common_ext: py + +Language_6: + name: java + pretty_name: Java + ext: java + common_ext: java + diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml --- a/test/fixtures/users.yml +++ b/test/fixtures/users.yml @@ -13,10 +13,10 @@ salt: <%= salt %> activated: true -mary: - login: mary - full_name: mary - hashed_password: <%= User.encrypt("goodbye",salt) %> +admin: + login: admin + full_name: admin + hashed_password: <%= User.encrypt("admin",salt) %> salt: <%= salt %> roles: admin activated: true diff --git a/test/integration/admin_task_test.rb b/test/integration/admin_task_test.rb new file mode 100644 --- /dev/null +++ b/test/integration/admin_task_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class AdminTaskTest < ActionDispatch::IntegrationTest + # test "the truth" do + # assert true + # end +end diff --git a/test/integration/login_test.rb b/test/integration/login_test.rb new file mode 100644 --- /dev/null +++ b/test/integration/login_test.rb @@ -0,0 +1,40 @@ +require 'test_helper' + +class LoginTest < ActionDispatch::IntegrationTest + # test "the truth" do + # assert true + # end + + test "login with invalid information" do + get root_path + assert_response :success + post login_login_path, login: "root", password: "hahaha" + assert_redirected_to root_path + end + + test "normal user login" do + get root_path + assert_response :success + post login_login_path, {login: "john", password: "hello" } + assert_redirected_to main_list_path + end + + test "normal user login in single_user mode" do + GraderConfiguration.find_by(key: GraderConfiguration::SINGLE_USER_KEY).update_attributes(value: 'true') + GraderConfiguration.reload + get root_path + assert_response :success + post login_login_path, {login: "john", password: "hello" } + follow_redirect! + assert_redirected_to root_path + end + + test "root login in in single_user mode" do + GraderConfiguration.find_by(key: GraderConfiguration::SINGLE_USER_KEY).update_attributes(value: 'true') + GraderConfiguration.reload + get root_path + assert_response :success + post login_login_path, {login: "admin", password: "admin" } + assert_redirected_to main_list_path + end +end diff --git a/test/performance/browsing_test.rb b/test/performance/browsing_test.rb deleted file mode 100644 --- a/test/performance/browsing_test.rb +++ /dev/null @@ -1,12 +0,0 @@ -require 'test_helper' -require 'rails/performance_test_help' - -class BrowsingTest < ActionDispatch::PerformanceTest - # Refer to the documentation for all available options - # self.profile_options = { :runs => 5, :metrics => [:wall_time, :memory] - # :output => 'tmp/performance', :formats => [:flat] } - - def test_homepage - get '/' - end -end diff --git a/test/test_helper.rb b/test/test_helper.rb --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -2,7 +2,18 @@ require File.expand_path('../../config/environment', __FILE__) require 'rails/test_help' +#reporter for beautiful result +require "minitest/reporters" +Minitest::Reporters.use! + +module SignInHelper + def sign_in_as(user,password) + post login_login_path, {login: user, password: password } + end +end + class ActiveSupport::TestCase + include SignInHelper # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order. # # Note: You'll currently still have to declare fixtures explicitly in integration tests diff --git a/test/unit/.gitkeep b/test/unit/.gitkeep deleted file mode 100644 diff --git a/test/unit/announcement_test.rb b/test/unit/announcement_test.rb deleted file mode 100644 --- a/test/unit/announcement_test.rb +++ /dev/null @@ -1,8 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' - -class AnnouncementTest < ActiveSupport::TestCase - # Replace this with your real tests. - def test_truth - assert true - end -end diff --git a/test/unit/configuration_test.rb b/test/unit/configuration_test.rb deleted file mode 100644 --- a/test/unit/configuration_test.rb +++ /dev/null @@ -1,8 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' - -class ConfigurationTest < ActiveSupport::TestCase - # Replace this with your real tests. - def test_truth - assert true - end -end diff --git a/test/unit/contest_test.rb b/test/unit/contest_test.rb deleted file mode 100644 --- a/test/unit/contest_test.rb +++ /dev/null @@ -1,8 +0,0 @@ -require 'test_helper' - -class ContestTest < ActiveSupport::TestCase - # Replace this with your real tests. - test "the truth" do - assert true - end -end diff --git a/test/unit/country_test.rb b/test/unit/country_test.rb deleted file mode 100644 --- a/test/unit/country_test.rb +++ /dev/null @@ -1,8 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' - -class CountryTest < ActiveSupport::TestCase - # Replace this with your real tests. - def test_truth - assert true - end -end diff --git a/test/unit/description_test.rb b/test/unit/description_test.rb deleted file mode 100644 --- a/test/unit/description_test.rb +++ /dev/null @@ -1,8 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' - -class DescriptionTest < ActiveSupport::TestCase - # Replace this with your real tests. - def test_truth - assert true - end -end diff --git a/test/unit/grader_process_test.rb b/test/unit/grader_process_test.rb deleted file mode 100644 --- a/test/unit/grader_process_test.rb +++ /dev/null @@ -1,8 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' - -class GraderProcessTest < ActiveSupport::TestCase - # Replace this with your real tests. - def test_truth - assert true - end -end diff --git a/test/unit/helpers/contest_management_helper_test.rb b/test/unit/helpers/contest_management_helper_test.rb deleted file mode 100644 --- a/test/unit/helpers/contest_management_helper_test.rb +++ /dev/null @@ -1,4 +0,0 @@ -require 'test_helper' - -class ContestManagementHelperTest < ActionView::TestCase -end diff --git a/test/unit/helpers/contests_helper_test.rb b/test/unit/helpers/contests_helper_test.rb deleted file mode 100644 --- a/test/unit/helpers/contests_helper_test.rb +++ /dev/null @@ -1,4 +0,0 @@ -require 'test_helper' - -class ContestsHelperTest < ActionView::TestCase -end diff --git a/test/unit/language_test.rb b/test/unit/language_test.rb deleted file mode 100644 --- a/test/unit/language_test.rb +++ /dev/null @@ -1,10 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' - -class LanguageTest < Test::Unit::TestCase - fixtures :languages - - # Replace this with your real tests. - def test_truth - assert true - end -end diff --git a/test/unit/message_test.rb b/test/unit/message_test.rb deleted file mode 100644 --- a/test/unit/message_test.rb +++ /dev/null @@ -1,8 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' - -class MessageTest < ActiveSupport::TestCase - # Replace this with your real tests. - def test_truth - assert true - end -end diff --git a/test/unit/problem_test.rb b/test/unit/problem_test.rb deleted file mode 100644 --- a/test/unit/problem_test.rb +++ /dev/null @@ -1,10 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' - -class ProblemTest < Test::Unit::TestCase - fixtures :problems - - # Replace this with your real tests. - def test_truth - assert true - end -end diff --git a/test/unit/right_test.rb b/test/unit/right_test.rb deleted file mode 100644 --- a/test/unit/right_test.rb +++ /dev/null @@ -1,10 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' - -class RightTest < Test::Unit::TestCase - fixtures :rights - - # Replace this with your real tests. - def test_truth - assert true - end -end diff --git a/test/unit/role_test.rb b/test/unit/role_test.rb deleted file mode 100644 --- a/test/unit/role_test.rb +++ /dev/null @@ -1,10 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' - -class RoleTest < Test::Unit::TestCase - fixtures :roles - - # Replace this with your real tests. - def test_truth - assert true - end -end diff --git a/test/unit/site_test.rb b/test/unit/site_test.rb deleted file mode 100644 --- a/test/unit/site_test.rb +++ /dev/null @@ -1,8 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' - -class SiteTest < ActiveSupport::TestCase - # Replace this with your real tests. - def test_truth - assert true - end -end diff --git a/test/unit/submission_test.rb b/test/unit/submission_test.rb deleted file mode 100644 --- a/test/unit/submission_test.rb +++ /dev/null @@ -1,10 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' - -class SubmissionTest < Test::Unit::TestCase - fixtures :submissions - - # Replace this with your real tests. - def test_truth - assert true - end -end diff --git a/test/unit/task_test.rb b/test/unit/task_test.rb deleted file mode 100644 --- a/test/unit/task_test.rb +++ /dev/null @@ -1,41 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' - -class TaskTest < Test::Unit::TestCase - fixtures :tasks - - self.use_transactional_fixtures = false - - def test_get_inqueue_simple - task1 = Task.get_inqueue_and_change_status(Task::STATUS_GRADING) - - assert_equal task1.id, 3, "should get the earliest task" - assert_equal task1.status, Task::STATUS_GRADING, "status changes" - - task2 = Task.get_inqueue_and_change_status(Task::STATUS_GRADING) - - assert_equal task2.id, 4, "should get the next task" - assert_equal task2.status, Task::STATUS_GRADING, "status changes" - end - - def generate_tasks(n) - n.times do |i| - Task.create(:submission_id => i, - :status => Task::STATUS_INQUEUE, - :create_at => Time.now + i.minutes) - end - end - - # use the process version in /test/concurrent instead - def UNUSED_test_get_inqueue_concurrent - ActiveRecord::Base.allow_concurrency = true - - task1 = Task.get_inqueue_and_change_status(Task::STATUS_GRADING) - - assert_equal task1.id, 3, "should get the earliest task" - assert_equal task1.status, Task::STATUS_GRADING, "status changes" - - ActiveRecord::Base.verify_active_connections! - end - -end - diff --git a/test/unit/test_pair_test.rb b/test/unit/test_pair_test.rb deleted file mode 100644 --- a/test/unit/test_pair_test.rb +++ /dev/null @@ -1,8 +0,0 @@ -require 'test_helper' - -class TestPairTest < ActiveSupport::TestCase - # Replace this with your real tests. - test "the truth" do - assert true - end -end diff --git a/test/unit/test_request_test.rb b/test/unit/test_request_test.rb deleted file mode 100644 --- a/test/unit/test_request_test.rb +++ /dev/null @@ -1,8 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' - -class TestRequestTest < ActiveSupport::TestCase - # Replace this with your real tests. - def test_truth - assert true - end -end diff --git a/test/unit/user_contest_stat_test.rb b/test/unit/user_contest_stat_test.rb deleted file mode 100644 --- a/test/unit/user_contest_stat_test.rb +++ /dev/null @@ -1,8 +0,0 @@ -require 'test_helper' - -class UserContestStatTest < ActiveSupport::TestCase - # Replace this with your real tests. - test "the truth" do - assert true - end -end diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb deleted file mode 100644 --- a/test/unit/user_test.rb +++ /dev/null @@ -1,10 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' - -class UserTest < Test::Unit::TestCase - fixtures :users - - # Replace this with your real tests. - def test_truth - assert true - end -end