diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -111,7 +111,6 @@ def authorization return false unless authenticate - puts "haha 1" user = User.find(session[:user_id]) unless user.roles.detect { |role| role.rights.detect{ |right| @@ -119,7 +118,6 @@ (right.action == 'all' or right.action == action_name) } } - puts "haha 2" flash[:notice] = 'You are not authorized to view the page you requested' #request.env['HTTP_REFERER'] ? (redirect_to :back) : (redirect_to :controller => 'login') redirect_to :controller => 'main', :action => 'login' 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 @@ -6,11 +6,9 @@ %br/ %br/ - - puts flash.inspect - if flash[:notice] %hr/ %b= flash[:notice] - %b= haha %hr/ %div{ :style => "border: solid 1px gray; padding: 4px; background: #eeeeff;"} diff --git a/db/schema.rb b/db/schema.rb --- a/db/schema.rb +++ b/db/schema.rb @@ -14,201 +14,190 @@ ActiveRecord::Schema.define(version: 20170124024527) do create_table "announcements", force: :cascade do |t| - t.string "author", limit: 255 - t.text "body", limit: 65535 + t.string "author" + t.text "body" t.boolean "published" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.boolean "frontpage", default: false - t.boolean "contest_only", default: false - t.string "title", limit: 255 - t.string "notes", limit: 255 + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.boolean "frontpage", default: false + t.boolean "contest_only", default: false + t.string "title" + t.string "notes" end create_table "contests", force: :cascade do |t| - t.string "title", limit: 255 + t.string "title" t.boolean "enabled" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.string "name", limit: 255 + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.string "name" end create_table "contests_problems", id: false, force: :cascade do |t| - t.integer "contest_id", limit: 4 - t.integer "problem_id", limit: 4 + t.integer "contest_id" + t.integer "problem_id" end create_table "contests_users", id: false, force: :cascade do |t| - t.integer "contest_id", limit: 4 - t.integer "user_id", limit: 4 + t.integer "contest_id" + t.integer "user_id" end create_table "countries", force: :cascade do |t| - t.string "name", limit: 255 - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.string "name" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false end create_table "descriptions", force: :cascade do |t| - t.text "body", limit: 65535 + t.text "body" t.boolean "markdowned" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false end create_table "grader_configurations", force: :cascade do |t| - t.string "key", limit: 255 - t.string "value_type", limit: 255 - t.string "value", limit: 255 - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.text "description", limit: 65535 + t.string "key" + t.string "value_type" + t.string "value" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.text "description" end create_table "grader_processes", force: :cascade do |t| - t.string "host", limit: 255 - t.integer "pid", limit: 4 - t.string "mode", limit: 255 + t.string "host" + t.integer "pid" + t.string "mode" t.boolean "active" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.integer "task_id", limit: 4 - t.string "task_type", limit: 255 + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.integer "task_id" + t.string "task_type" t.boolean "terminated" end - add_index "grader_processes", ["host", "pid"], name: "index_grader_processes_on_ip_and_pid", using: :btree + add_index "grader_processes", ["host", "pid"], name: "index_grader_processes_on_ip_and_pid" create_table "heart_beats", force: :cascade do |t| - t.integer "user_id", limit: 4 - t.string "ip_address", limit: 255 - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.string "status", limit: 255 + t.integer "user_id" + t.string "ip_address" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.string "status" end - add_index "heart_beats", ["updated_at"], name: "index_heart_beats_on_updated_at", using: :btree + add_index "heart_beats", ["updated_at"], name: "index_heart_beats_on_updated_at" create_table "languages", force: :cascade do |t| t.string "name", limit: 10 - t.string "pretty_name", limit: 255 + t.string "pretty_name" t.string "ext", limit: 10 - t.string "common_ext", limit: 255 + t.string "common_ext" end create_table "logins", force: :cascade do |t| - t.integer "user_id", limit: 4 - t.string "ip_address", limit: 255 - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id" + t.string "ip_address" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false end create_table "messages", force: :cascade do |t| - t.integer "sender_id", limit: 4 - t.integer "receiver_id", limit: 4 - t.integer "replying_message_id", limit: 4 - t.text "body", limit: 65535 + t.integer "sender_id" + t.integer "receiver_id" + t.integer "replying_message_id" + t.text "body" t.boolean "replied" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false end - create_table "problems", force: :cascade do |t| - t.string "name", limit: 30 - t.string "full_name", limit: 255 - t.integer "full_score", limit: 4 - t.date "date_added" - t.boolean "available" - t.string "url", limit: 255 - t.integer "description_id", limit: 4 - t.boolean "test_allowed" - t.boolean "output_only" - t.string "description_filename", limit: 255 - t.boolean "view_testcase" - end +# Could not dump table "problems" because of following NoMethodError +# undefined method `[]' for nil:NilClass create_table "rights", force: :cascade do |t| - t.string "name", limit: 255 - t.string "controller", limit: 255 - t.string "action", limit: 255 + t.string "name" + t.string "controller" + t.string "action" end create_table "rights_roles", id: false, force: :cascade do |t| - t.integer "right_id", limit: 4 - t.integer "role_id", limit: 4 + t.integer "right_id" + t.integer "role_id" end - add_index "rights_roles", ["role_id"], name: "index_rights_roles_on_role_id", using: :btree + add_index "rights_roles", ["role_id"], name: "index_rights_roles_on_role_id" create_table "roles", force: :cascade do |t| - t.string "name", limit: 255 + t.string "name" end create_table "roles_users", id: false, force: :cascade do |t| - t.integer "role_id", limit: 4 - t.integer "user_id", limit: 4 + t.integer "role_id" + t.integer "user_id" end - add_index "roles_users", ["user_id"], name: "index_roles_users_on_user_id", using: :btree + add_index "roles_users", ["user_id"], name: "index_roles_users_on_user_id" create_table "sessions", force: :cascade do |t| - t.string "session_id", limit: 255 - t.text "data", limit: 65535 + t.string "session_id" + t.text "data" t.datetime "updated_at" end - add_index "sessions", ["session_id"], name: "index_sessions_on_session_id", using: :btree - add_index "sessions", ["updated_at"], name: "index_sessions_on_updated_at", using: :btree + add_index "sessions", ["session_id"], name: "index_sessions_on_session_id" + add_index "sessions", ["updated_at"], name: "index_sessions_on_updated_at" create_table "sites", force: :cascade do |t| - t.string "name", limit: 255 + t.string "name" t.boolean "started" t.datetime "start_time" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.integer "country_id", limit: 4 - t.string "password", limit: 255 + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.integer "country_id" + t.string "password" end create_table "submission_view_logs", force: :cascade do |t| - t.integer "user_id", limit: 4 - t.integer "submission_id", limit: 4 - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id" + t.integer "submission_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false end create_table "submissions", force: :cascade do |t| - t.integer "user_id", limit: 4 - t.integer "problem_id", limit: 4 - t.integer "language_id", limit: 4 - t.text "source", limit: 65535 - t.binary "binary", limit: 65535 + t.integer "user_id" + t.integer "problem_id" + t.integer "language_id" + t.text "source" + t.binary "binary" t.datetime "submitted_at" t.datetime "compiled_at" - t.text "compiler_message", limit: 65535 + t.text "compiler_message" t.datetime "graded_at" - t.integer "points", limit: 4 - t.text "grader_comment", limit: 65535 - t.integer "number", limit: 4 - t.string "source_filename", limit: 255 - t.float "max_runtime", limit: 24 - t.integer "peak_memory", limit: 4 - t.integer "effective_code_length", limit: 4 - t.string "ip_address", limit: 255 + t.integer "points" + t.text "grader_comment" + t.integer "number" + t.string "source_filename" + t.float "max_runtime" + t.integer "peak_memory" + t.integer "effective_code_length" + t.string "ip_address" end - add_index "submissions", ["user_id", "problem_id", "number"], name: "index_submissions_on_user_id_and_problem_id_and_number", unique: true, using: :btree - add_index "submissions", ["user_id", "problem_id"], name: "index_submissions_on_user_id_and_problem_id", using: :btree + add_index "submissions", ["user_id", "problem_id", "number"], name: "index_submissions_on_user_id_and_problem_id_and_number", unique: true + add_index "submissions", ["user_id", "problem_id"], name: "index_submissions_on_user_id_and_problem_id" create_table "tasks", force: :cascade do |t| - t.integer "submission_id", limit: 4 + t.integer "submission_id" t.datetime "created_at" - t.integer "status", limit: 4 + t.integer "status" t.datetime "updated_at" end create_table "test_pairs", force: :cascade do |t| - t.integer "problem_id", limit: 4 + t.integer "problem_id" t.text "input", limit: 16777215 t.text "solution", limit: 16777215 t.datetime "created_at", null: false @@ -216,66 +205,66 @@ end create_table "test_requests", force: :cascade do |t| - t.integer "user_id", limit: 4 - t.integer "problem_id", limit: 4 - t.integer "submission_id", limit: 4 - t.string "input_file_name", limit: 255 - t.string "output_file_name", limit: 255 - t.string "running_stat", limit: 255 - t.integer "status", limit: 4 - t.datetime "updated_at", null: false + t.integer "user_id" + t.integer "problem_id" + t.integer "submission_id" + t.string "input_file_name" + t.string "output_file_name" + t.string "running_stat" + t.integer "status" + t.datetime "updated_at", null: false t.datetime "submitted_at" t.datetime "compiled_at" - t.text "compiler_message", limit: 65535 + t.text "compiler_message" t.datetime "graded_at" - t.string "grader_comment", limit: 255 - t.datetime "created_at", null: false - t.float "running_time", limit: 24 - t.string "exit_status", limit: 255 - t.integer "memory_usage", limit: 4 + t.string "grader_comment" + t.datetime "created_at", null: false + t.float "running_time" + t.string "exit_status" + t.integer "memory_usage" end - add_index "test_requests", ["user_id", "problem_id"], name: "index_test_requests_on_user_id_and_problem_id", using: :btree + add_index "test_requests", ["user_id", "problem_id"], name: "index_test_requests_on_user_id_and_problem_id" create_table "testcases", force: :cascade do |t| - t.integer "problem_id", limit: 4 - t.integer "num", limit: 4 - t.integer "group", limit: 4 - t.integer "score", limit: 4 + t.integer "problem_id" + t.integer "num" + t.integer "group" + t.integer "score" t.text "input", limit: 4294967295 t.text "sol", limit: 4294967295 - t.datetime "created_at" - t.datetime "updated_at" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false end - add_index "testcases", ["problem_id"], name: "index_testcases_on_problem_id", using: :btree + add_index "testcases", ["problem_id"], name: "index_testcases_on_problem_id" create_table "user_contest_stats", force: :cascade do |t| - t.integer "user_id", limit: 4 + t.integer "user_id" t.datetime "started_at" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.boolean "forced_logout" end create_table "users", force: :cascade do |t| t.string "login", limit: 50 - t.string "full_name", limit: 255 - t.string "hashed_password", limit: 255 + t.string "full_name" + t.string "hashed_password" t.string "salt", limit: 5 - t.string "alias", limit: 255 - t.string "email", limit: 255 - t.integer "site_id", limit: 4 - t.integer "country_id", limit: 4 - t.boolean "activated", default: false + t.string "alias" + t.string "email" + t.integer "site_id" + t.integer "country_id" + t.boolean "activated", default: false t.datetime "created_at" t.datetime "updated_at" - t.boolean "enabled", default: true - t.string "remark", limit: 255 - t.string "last_ip", limit: 255 - t.string "section", limit: 255 + t.boolean "enabled", default: true + t.string "remark" + t.string "last_ip" + t.string "section" end - add_index "users", ["login"], name: "index_users_on_login", unique: true, using: :btree + add_index "users", ["login"], name: "index_users_on_login", unique: true end 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: 'test', body: 'haha', published: true} + 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: { body: 'another body' } + 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/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/test_helper.rb b/test/test_helper.rb --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -2,11 +2,18 @@ require File.expand_path('../../config/environment', __FILE__) require 'rails/test_help' -#reporter +#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