| Name | -URL | -Summary | -- | - - - <% @infos.each do |info| %> - |
|---|---|---|---|---|
| <%= link_to info.name, info %> | -<%= "/info/#{info.name}" %> | -
- <%= info.title %> - <%= Redcarpet::Markdown.new(Redcarpet::Render::HTML_TOC.new(no_links: true, space_after_headers: true, escape_html: true, nesting_level: 2)).render(info.text).to_s.html_safe %><%#TODO: move to nzic_models helper %> - |
- <%= link_to "Edit", edit_nzic_info_path(info) %> | -<%= "Destroy" %> | -
| ID | -Name | -Link | -- | - - - <% @menu_items.each do |menu| %> - |
|---|---|---|---|---|
| <%= menu.id %> | -<%= link_to menu.name, menu %> | -<%= menu.link %> | -<%= link_to "Edit", edit_nzic_menu_item_path(menu) %> | -<%= "Destroy" %> | -
Name: <%= @menu_item.name %>
-Link: <%= @menu_item.link %>
- diff --git a/app/views/pages/forum.html.erb b/app/views/pages/forum.html.erb new file mode 100644 index 00000000..4f6b6da5 --- /dev/null +++ b/app/views/pages/forum.html.erb @@ -0,0 +1,3 @@ +We've discontinued the forums.
diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 00000000..41844acb --- /dev/null +++ b/config/database.yml @@ -0,0 +1,17 @@ +# SQLite version 3.x +# gem install sqlite3 +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +default: &default + adapter: postgresql + pool: 5 + timeout: 5000 + +test: + <<: *default + url: <%= ENV["DATABASE_URL"] %> + +nzic_test: + <<: *default + url: <%= ENV["NZIC_DATABASE_URL"] %> diff --git a/config/database.yml.template b/config/database.yml.template index 880ddb17..252b43f7 100644 --- a/config/database.yml.template +++ b/config/database.yml.template @@ -26,26 +26,3 @@ production: username: ${DATABASE_USERNAME} password: -nzic_development: - adapter: postgresql - encoding: unicode - database: nzic - pool: 5 - username: ${DATABASE_USERNAME} - password: - -nzic_test: - adapter: postgresql - encoding: unicode - database: ${TEST_DATABASE} - pool: 5 - username: ${DATABASE_USERNAME} - -nzic_production: - adapter: postgresql - encoding: unicode - database: nzic - pool: 5 - username: ${DATABASE_USERNAME} - password: - diff --git a/config/environment.rb b/config/environment.rb index 906a4f55..33bf8edd 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -12,5 +12,15 @@ #ActiveRecord::Base.pluralize_table_names = false +require 'active_record/connection_adapters/postgresql_adapter' + +class ActiveRecord::ConnectionAdapters::PostgreSQLAdapter + def set_standard_conforming_strings + old, self.client_min_messages = client_min_messages, 'warning' + execute('SET standard_conforming_strings = on', 'SCHEMA') rescue nil + ensure + self.client_min_messages = old + end +end #Initialize the rails application NZTrain::Application.initialize! diff --git a/config/initializers/forem.rb b/config/initializers/forem.rb deleted file mode 100644 index 968ebc7a..00000000 --- a/config/initializers/forem.rb +++ /dev/null @@ -1,16 +0,0 @@ -Forem.user_class = "User" -Forem.email_from_address = "nztrain@gmail.com" -# If you do not want to use gravatar for avatars then specify the method to use here: -Forem.avatar_user_method = :forem_avatar -Forem.per_page = 20 - - -Rails.application.config.to_prepare do -# If you want to change the layout that Forem uses, uncomment and customize the next line: - Forem.layout = "scaffold" -# -# If you want to add your own cancan Abilities to Forem, uncomment and customize the next line: -# Forem::Ability.register_ability(Ability) -end -# -# By default, these lines will use the layout located at app/views/layouts/forem.html.erb in your application. diff --git a/config/initializers/nzic.rb b/config/initializers/nzic.rb deleted file mode 100644 index feb1a681..00000000 --- a/config/initializers/nzic.rb +++ /dev/null @@ -1,7 +0,0 @@ - -Rails.configuration.to_prepare do - NZIC::Base.class_eval do - establish_connection "nzic_#{Rails.env}" - end -end - diff --git a/config/redis.yml b/config/redis.yml new file mode 100644 index 00000000..5dfb0b74 --- /dev/null +++ b/config/redis.yml @@ -0,0 +1,11 @@ +default: + host: localhost + port: 6379 + password: "" +production: + db: 0 +development: + db: 1 +test: + db: 2 + diff --git a/config/routes.rb b/config/routes.rb index d2d886b7..bea23c67 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,12 +1,4 @@ NZTrain::Application.routes.draw do - - # This line mounts Forem's routes at /forums by default. - # This means, any requests to the /forums URL of your application will go to Forem::ForumsController#index. - # If you would like to change where this extension is mounted, simply change the :at option to something different. - # - # We ask that you don't use the :as option here, as Forem relies on it being the default of "forem" - mount Forem::Engine, :at => '/forum' - concern :file_root do |options| options ||= {} resources :files, options.merge(:except => [:new, :edit]) do @@ -256,16 +248,6 @@ end end - get 'nzic/info/*name/edit', to: 'nzic/info#edit', as: :edit_nzic_info - namespace :nzic do - resources :infos, controller: :info, param: :name, only: [:index, :new, :create] - get 'info/*name', to: 'info#show', as: :info - patch 'info/*name', to: 'info#update' - delete 'info/*name', to: 'info#destroy' - - resources :menu_items - end - # Sample resource route (maps HTTP verbs to controller actions automatically): # resources :products @@ -308,4 +290,6 @@ # See how all your routes lay out with "rake routes" + # Legacy routes maintained to avoid routes breaking + get "/forum/*anything" => "pages#forum" end diff --git a/spec/controllers/accounts/passwords_controller_spec.rb b/spec/controllers/accounts/passwords_controller_spec.rb index e71e846f..c972e100 100644 --- a/spec/controllers/accounts/passwords_controller_spec.rb +++ b/spec/controllers/accounts/passwords_controller_spec.rb @@ -21,7 +21,7 @@ context "using password reset token" do before(:all) do - @resetuser = FactoryGirl.create(:user) + @resetuser = FactoryBot.create(:user) end after(:all) do @resetuser.destroy diff --git a/spec/controllers/accounts/registrations_controller_spec.rb b/spec/controllers/accounts/registrations_controller_spec.rb index fb0f4ce5..2befdb69 100644 --- a/spec/controllers/accounts/registrations_controller_spec.rb +++ b/spec/controllers/accounts/registrations_controller_spec.rb @@ -24,7 +24,7 @@ context 'when signed in' do before(:all) do - @user = FactoryGirl.create(:user, :password => "registration password") + @user = FactoryBot.create(:user, :password => "registration password") end after(:all) do @user.destroy @@ -46,7 +46,7 @@ context 'when signed in' do before(:each) do - @user = FactoryGirl.create(:user, :password => "registration password") + @user = FactoryBot.create(:user, :password => "registration password") sign_in @user end after(:each) do diff --git a/spec/controllers/contests_controller_spec.rb b/spec/controllers/contests_controller_spec.rb index 571a2c8a..585792fe 100644 --- a/spec/controllers/contests_controller_spec.rb +++ b/spec/controllers/contests_controller_spec.rb @@ -2,8 +2,8 @@ describe ContestsController do before(:all) do - @problem_set = FactoryGirl.create(:problem_set) - @contest = FactoryGirl.create(:contest, :problem_set => @problem_set) + @problem_set = FactoryBot.create(:problem_set) + @contest = FactoryBot.create(:contest, :problem_set => @problem_set) end after(:all) do @contest.destroy diff --git a/spec/controllers/evaluators_controller_spec.rb b/spec/controllers/evaluators_controller_spec.rb index d3e12a62..ef0ed3d2 100644 --- a/spec/controllers/evaluators_controller_spec.rb +++ b/spec/controllers/evaluators_controller_spec.rb @@ -2,7 +2,7 @@ describe EvaluatorsController do before(:all) do - @evaluator = FactoryGirl.create(:evaluator) + @evaluator = FactoryBot.create(:evaluator) end after(:all) do @evaluator.destroy diff --git a/spec/controllers/groups_controller_spec.rb b/spec/controllers/groups_controller_spec.rb index 0cb3e503..c275c083 100644 --- a/spec/controllers/groups_controller_spec.rb +++ b/spec/controllers/groups_controller_spec.rb @@ -2,7 +2,7 @@ describe GroupsController do before(:all) do - @group = FactoryGirl.create(:group) + @group = FactoryBot.create(:group) end after(:all) do @group.destroy diff --git a/spec/controllers/problem_sets_controller_spec.rb b/spec/controllers/problem_sets_controller_spec.rb index 9868979b..033752ec 100644 --- a/spec/controllers/problem_sets_controller_spec.rb +++ b/spec/controllers/problem_sets_controller_spec.rb @@ -2,7 +2,7 @@ describe ProblemSetsController do before(:all) do - @problem_set = FactoryGirl.create(:problem_set) + @problem_set = FactoryBot.create(:problem_set) end after(:all) do @problem_set.destroy diff --git a/spec/controllers/problems_controller_spec.rb b/spec/controllers/problems_controller_spec.rb index 6f3d86b1..02c4aa47 100644 --- a/spec/controllers/problems_controller_spec.rb +++ b/spec/controllers/problems_controller_spec.rb @@ -2,9 +2,9 @@ describe ProblemsController do before(:all) do - @group = FactoryGirl.create(:group, :name => "Special Group", :members => [users(:admin),users(:user)]) - @group_set = FactoryGirl.create(:problem_set, :name => "Set in Group", :groups => [@group]) - @group_problem = FactoryGirl.create(:adding_problem, :problem_sets => [@group_set]) + @group = FactoryBot.create(:group, :name => "Special Group", :members => [users(:admin),users(:user)]) + @group_set = FactoryBot.create(:problem_set, :name => "Set in Group", :groups => [@group]) + @group_problem = FactoryBot.create(:adding_problem, :problem_sets => [@group_set]) end after(:all) do [@group, @group_set, @group_problem].reverse_each { |object| object.destroy } @@ -17,8 +17,8 @@ context "as admin" do before(:all) do - @owned_problem = FactoryGirl.create(:problem, :owner => users(:admin)) - @unowned_problem = FactoryGirl.create(:problem) + @owned_problem = FactoryBot.create(:problem, :owner => users(:admin)) + @unowned_problem = FactoryBot.create(:problem) end after(:all) do @unowned_problem.destroy @@ -33,8 +33,8 @@ context "as a normal user" do before(:all) do - @owned_problem = FactoryGirl.create(:problem, :owner => users(:user)) - @unowned_problem = FactoryGirl.create(:problem) + @owned_problem = FactoryBot.create(:problem, :owner => users(:user)) + @unowned_problem = FactoryBot.create(:problem) end after(:all) do @unowned_problem.destroy diff --git a/spec/controllers/roles_controller_spec.rb b/spec/controllers/roles_controller_spec.rb index d488b548..8094af3d 100644 --- a/spec/controllers/roles_controller_spec.rb +++ b/spec/controllers/roles_controller_spec.rb @@ -2,7 +2,7 @@ describe RolesController do before(:all) do - @role = FactoryGirl.create(:role) + @role = FactoryBot.create(:role) end after(:all) do @role.destroy diff --git a/spec/controllers/settings_controller_spec.rb b/spec/controllers/settings_controller_spec.rb index 0b05ce2f..b1541e5e 100644 --- a/spec/controllers/settings_controller_spec.rb +++ b/spec/controllers/settings_controller_spec.rb @@ -2,7 +2,7 @@ describe SettingsController do before(:all) do - @setting = FactoryGirl.create(:setting) + @setting = FactoryBot.create(:setting) end after(:all) do @setting.destroy diff --git a/spec/controllers/submissions_controller_spec.rb b/spec/controllers/submissions_controller_spec.rb index e638cd75..1fd481db 100644 --- a/spec/controllers/submissions_controller_spec.rb +++ b/spec/controllers/submissions_controller_spec.rb @@ -2,7 +2,7 @@ describe SubmissionsController do before(:all) do - @submission = FactoryGirl.create(:submission, :problem => problems(:problem), :user => users(:superadmin)) + @submission = FactoryBot.create(:submission, :problem => problems(:problem), :user => users(:superadmin)) end after(:all) do @submission.destroy diff --git a/spec/controllers/test_cases_controller_spec.rb b/spec/controllers/test_cases_controller_spec.rb index e162523a..e5536245 100644 --- a/spec/controllers/test_cases_controller_spec.rb +++ b/spec/controllers/test_cases_controller_spec.rb @@ -3,7 +3,7 @@ describe TestCasesController do before { pending } before(:all) do - @test_case = FactoryGirl.create(:test_case, :problem_id => test_sets(:test_set).problem_id) + @test_case = FactoryBot.create(:test_case, :problem_id => test_sets(:test_set).problem_id) TestCaseRelation.create(:test_set => test_sets(:test_set), :test_case => @test_case) end after(:all) do diff --git a/spec/controllers/test_sets_controller_spec.rb b/spec/controllers/test_sets_controller_spec.rb index c6b3dfb9..18c60bc6 100644 --- a/spec/controllers/test_sets_controller_spec.rb +++ b/spec/controllers/test_sets_controller_spec.rb @@ -2,7 +2,7 @@ describe TestSetsController do before(:all) do - @test_set = FactoryGirl.create(:test_set, :problem => problems(:problem)) + @test_set = FactoryBot.create(:test_set, :problem => problems(:problem)) end after(:all) do @test_set.destroy diff --git a/spec/factories/ai_contest_games.rb b/spec/factories/ai_contest_games.rb index fb77377d..dc854f14 100644 --- a/spec/factories/ai_contest_games.rb +++ b/spec/factories/ai_contest_games.rb @@ -1,6 +1,6 @@ -# Read about factories at https://github.com/thoughtbot/factory_girl +# Read about factories at https://github.com/thoughtbot/factory_bot -FactoryGirl.define do +FactoryBot.define do factory :ai_contest_games do ai_contest_id 1 ai_submission_2_id 1 diff --git a/spec/factories/ai_contests.rb b/spec/factories/ai_contests.rb index 391949e1..5a3ec77c 100644 --- a/spec/factories/ai_contests.rb +++ b/spec/factories/ai_contests.rb @@ -1,6 +1,6 @@ -# Read about factories at https://github.com/thoughtbot/factory_girl +# Read about factories at https://github.com/thoughtbot/factory_bot -FactoryGirl.define do +FactoryBot.define do factory :ai_contest do name "MyString" start_time "2013-01-07 14:51:43" diff --git a/spec/factories/ai_submissions.rb b/spec/factories/ai_submissions.rb index 68d5a690..08855ca1 100644 --- a/spec/factories/ai_submissions.rb +++ b/spec/factories/ai_submissions.rb @@ -1,6 +1,6 @@ -# Read about factories at https://github.com/thoughtbot/factory_girl +# Read about factories at https://github.com/thoughtbot/factory_bot -FactoryGirl.define do +FactoryBot.define do factory :ai_submission do source "MyText" language "MyString" diff --git a/spec/factories/contest_relations.rb b/spec/factories/contest_relations.rb index ee3d5b94..4210b567 100644 --- a/spec/factories/contest_relations.rb +++ b/spec/factories/contest_relations.rb @@ -1,6 +1,6 @@ -# Read about factories at https://github.com/thoughtbot/factory_girl +# Read about factories at https://github.com/thoughtbot/factory_bot -FactoryGirl.define do +FactoryBot.define do factory :contest_relation do user_id 0 contest_id 0 diff --git a/spec/factories/contest_scores.rb b/spec/factories/contest_scores.rb index 1f6ec246..7b22d520 100644 --- a/spec/factories/contest_scores.rb +++ b/spec/factories/contest_scores.rb @@ -1,6 +1,6 @@ -# Read about factories at https://github.com/thoughtbot/factory_girl +# Read about factories at https://github.com/thoughtbot/factory_bot -FactoryGirl.define do +FactoryBot.define do factory :contest_score do user_id 0 contest_relation_id 0 diff --git a/spec/factories/contest_supervisors.rb b/spec/factories/contest_supervisors.rb index bfd089b6..0b06c386 100644 --- a/spec/factories/contest_supervisors.rb +++ b/spec/factories/contest_supervisors.rb @@ -1,6 +1,6 @@ -# Read about factories at https://github.com/thoughtbot/factory_girl +# Read about factories at https://github.com/thoughtbot/factory_bot -FactoryGirl.define do +FactoryBot.define do factory :contest_supervisor, :class => 'ContestSupervisors' do contest_id 1 user_id 1 diff --git a/spec/factories/contests.rb b/spec/factories/contests.rb index f103aa60..b7a922c7 100644 --- a/spec/factories/contests.rb +++ b/spec/factories/contests.rb @@ -1,6 +1,6 @@ -# Read about factories at https://github.com/thoughtbot/factory_girl +# Read about factories at https://github.com/thoughtbot/factory_bot -FactoryGirl.define do +FactoryBot.define do factory :contest do sequence(:name) {|n| "Contest #{n}" } start_time "2012-01-01 08:00:00" diff --git a/spec/factories/evaluators.rb b/spec/factories/evaluators.rb index cc5c063e..a711aff0 100644 --- a/spec/factories/evaluators.rb +++ b/spec/factories/evaluators.rb @@ -1,6 +1,6 @@ -# Read about factories at https://github.com/thoughtbot/factory_girl +# Read about factories at https://github.com/thoughtbot/factory_bot -FactoryGirl.define do +FactoryBot.define do factory :evaluator do sequence(:name) {|n| "Evaluator #{n}" } description "Evaluator description" diff --git a/spec/factories/groups.rb b/spec/factories/groups.rb index 8c30136f..c0beaf0d 100644 --- a/spec/factories/groups.rb +++ b/spec/factories/groups.rb @@ -1,6 +1,6 @@ -# Read about factories at https://github.com/thoughtbot/factory_girl +# Read about factories at https://github.com/thoughtbot/factory_bot -FactoryGirl.define do +FactoryBot.define do factory :group do sequence(:name) {|n| "Group #{n}" } owner_id 0 diff --git a/spec/factories/languages.rb b/spec/factories/languages.rb index efe99347..ad2b3858 100644 --- a/spec/factories/languages.rb +++ b/spec/factories/languages.rb @@ -1,6 +1,6 @@ -# Read about factories at https://github.com/thoughtbot/factory_girl +# Read about factories at https://github.com/thoughtbot/factory_bot -FactoryGirl.define do +FactoryBot.define do factory :language do name "MyString" compiler "MyString" diff --git a/spec/factories/problem_sets.rb b/spec/factories/problem_sets.rb index 539d53c2..c22df2aa 100644 --- a/spec/factories/problem_sets.rb +++ b/spec/factories/problem_sets.rb @@ -1,6 +1,6 @@ -# Read about factories at https://github.com/thoughtbot/factory_girl +# Read about factories at https://github.com/thoughtbot/factory_bot -FactoryGirl.define do +FactoryBot.define do factory :problem_set do sequence(:name) {|n| "Problem Set #{n}" } owner_id 0 diff --git a/spec/factories/problems.rb b/spec/factories/problems.rb index 9ae24a77..cff9c655 100644 --- a/spec/factories/problems.rb +++ b/spec/factories/problems.rb @@ -1,6 +1,6 @@ -# Read about factories at https://github.com/thoughtbot/factory_girl +# Read about factories at https://github.com/thoughtbot/factory_bot -FactoryGirl.define do +FactoryBot.define do factory :problem do sequence(:name) {|n| "Problem #{n}" } statement "Do nothing" @@ -16,15 +16,15 @@ output "add.out" memory_limit 30 time_limit 1 - test_cases { [FactoryGirl.create(:test_case, :input => "5 9", :output => "14"), - FactoryGirl.create(:test_case, :input => "100 -50", :output => "50"), - FactoryGirl.create(:test_case, :input => "1235 942", :output => "2177"), - FactoryGirl.create(:test_case, :input => "-4000 123", :output => "-3877")] } - test_sets { (0...4).map{FactoryGirl.create(:test_set)} } + test_cases { [FactoryBot.create(:test_case, :input => "5 9", :output => "14"), + FactoryBot.create(:test_case, :input => "100 -50", :output => "50"), + FactoryBot.create(:test_case, :input => "1235 942", :output => "2177"), + FactoryBot.create(:test_case, :input => "-4000 123", :output => "-3877")] } + test_sets { (0...4).map{FactoryBot.create(:test_set)} } after(:create) do |problem| (0...4).each do |i| - FactoryGirl.create(:test_case_relation, :test_case => problem.test_cases[i], :test_set => problem.test_sets[i]) + FactoryBot.create(:test_case_relation, :test_case => problem.test_cases[i], :test_set => problem.test_sets[i]) end end diff --git a/spec/factories/roles.rb b/spec/factories/roles.rb index ee31177a..47decf4b 100644 --- a/spec/factories/roles.rb +++ b/spec/factories/roles.rb @@ -1,6 +1,6 @@ -# Read about factories at https://github.com/thoughtbot/factory_girl +# Read about factories at https://github.com/thoughtbot/factory_bot -FactoryGirl.define do +FactoryBot.define do factory :role do sequence(:name) {|n| "Role #{n}" } end diff --git a/spec/factories/settings.rb b/spec/factories/settings.rb index f68cd479..b4e700d6 100644 --- a/spec/factories/settings.rb +++ b/spec/factories/settings.rb @@ -1,6 +1,6 @@ -# Read about factories at https://github.com/thoughtbot/factory_girl +# Read about factories at https://github.com/thoughtbot/factory_bot -FactoryGirl.define do +FactoryBot.define do factory :setting do sequence(:key) {|n| "Setting #{n}" } value "value" diff --git a/spec/factories/submissions.rb b/spec/factories/submissions.rb index 8c35722e..80de2cc5 100644 --- a/spec/factories/submissions.rb +++ b/spec/factories/submissions.rb @@ -1,6 +1,6 @@ -# Read about factories at https://github.com/thoughtbot/factory_girl +# Read about factories at https://github.com/thoughtbot/factory_bot -FactoryGirl.define do +FactoryBot.define do factory :submission do source "sauce" language { LanguageGroup.find_by_identifier("c++").current_language } diff --git a/spec/factories/test_case_relations.rb b/spec/factories/test_case_relations.rb index d6497d29..1749c772 100644 --- a/spec/factories/test_case_relations.rb +++ b/spec/factories/test_case_relations.rb @@ -1,6 +1,6 @@ -# Read about factories at https://github.com/thoughtbot/factory_girl +# Read about factories at https://github.com/thoughtbot/factory_bot -FactoryGirl.define do +FactoryBot.define do factory :test_case_relation do end end diff --git a/spec/factories/test_cases.rb b/spec/factories/test_cases.rb index 72c30900..81897df7 100644 --- a/spec/factories/test_cases.rb +++ b/spec/factories/test_cases.rb @@ -1,6 +1,6 @@ -# Read about factories at https://github.com/thoughtbot/factory_girl +# Read about factories at https://github.com/thoughtbot/factory_bot -FactoryGirl.define do +FactoryBot.define do factory :test_case do sequence(:name) {|n| "Test Case #{n}" } input "Input" diff --git a/spec/factories/test_sets.rb b/spec/factories/test_sets.rb index 46f41851..f9240912 100644 --- a/spec/factories/test_sets.rb +++ b/spec/factories/test_sets.rb @@ -1,6 +1,6 @@ -# Read about factories at https://github.com/thoughtbot/factory_girl +# Read about factories at https://github.com/thoughtbot/factory_bot -FactoryGirl.define do +FactoryBot.define do factory :test_set do sequence(:name) {|n| "Test Set #{n}" } points 1 diff --git a/spec/factories/users.rb b/spec/factories/users.rb index acf3b560..e13166a9 100644 --- a/spec/factories/users.rb +++ b/spec/factories/users.rb @@ -1,6 +1,6 @@ -# Read about factories at https://github.com/thoughtbot/factory_girl +# Read about factories at https://github.com/thoughtbot/factory_bot -FactoryGirl.define do +FactoryBot.define do factory :user, :aliases => [:owner] do name "Name of User" sequence(:username) {|n| "user#{n}" } diff --git a/spec/features/invitation_and_join_request_spec.rb b/spec/features/invitation_and_join_request_spec.rb index 0bfbca99..3a45604a 100644 --- a/spec/features/invitation_and_join_request_spec.rb +++ b/spec/features/invitation_and_join_request_spec.rb @@ -2,7 +2,7 @@ feature 'invitation and join request' do scenario 'group owner invites a user, and user accepts invitation to group' do - @group = FactoryGirl.create(:group, :owner => users(:organiser), :visibility => Group::VISIBILITY[:private], :membership => Group::MEMBERSHIP[:private]) + @group = FactoryBot.create(:group, :owner => users(:organiser), :visibility => Group::VISIBILITY[:private], :membership => Group::MEMBERSHIP[:private]) login_as users(:organiser), :scope => :user visit invites_members_group_path(@group) @@ -30,7 +30,7 @@ end scenario 'group member invites a user and cancels the invitation' do - @group = FactoryGirl.create(:group, :members => [users(:user)], :visibility => Group::VISIBILITY[:private], :membership => Group::MEMBERSHIP[:invitation]) + @group = FactoryBot.create(:group, :members => [users(:user)], :visibility => Group::VISIBILITY[:private], :membership => Group::MEMBERSHIP[:invitation]) login_as users(:user), :scope => :user visit invites_members_group_path(@group) @@ -50,7 +50,7 @@ end scenario 'user applies to join group, and group member accepts join request' do - @group = FactoryGirl.create(:group, :owner => users(:organiser), :visibility => Group::VISIBILITY[:unlisted], :membership => Group::MEMBERSHIP[:invitation]) + @group = FactoryBot.create(:group, :owner => users(:organiser), :visibility => Group::VISIBILITY[:unlisted], :membership => Group::MEMBERSHIP[:invitation]) login_as users(:user), :scope => :user visit group_path(@group) @@ -70,7 +70,7 @@ end scenario 'user applies to join group, and group owner rejects join request' do - @group = FactoryGirl.create(:group, :owner => users(:organiser), :visibility => Group::VISIBILITY[:public], :membership => Group::MEMBERSHIP[:application]) + @group = FactoryBot.create(:group, :owner => users(:organiser), :visibility => Group::VISIBILITY[:public], :membership => Group::MEMBERSHIP[:application]) login_as users(:user), :scope => :user visit group_path(@group) diff --git a/spec/features/submissions_spec.rb b/spec/features/submissions_spec.rb index 2ba7a4f3..534bcd53 100644 --- a/spec/features/submissions_spec.rb +++ b/spec/features/submissions_spec.rb @@ -2,8 +2,8 @@ feature 'submission' do scenario 'submit code for a problem' do - @problem = FactoryGirl.create(:adding_problem) - @problem_set = FactoryGirl.create(:problem_set, :problems => [@problem], :group_ids => [0]) + @problem = FactoryBot.create(:adding_problem) + @problem_set = FactoryBot.create(:problem_set, :problems => [@problem], :group_ids => [0]) login_as users(:user), :scope => :user visit submit_problem_path(@problem) diff --git a/spec/models/contest_relation_spec.rb b/spec/models/contest_relation_spec.rb index eff5bec3..6cffe302 100644 --- a/spec/models/contest_relation_spec.rb +++ b/spec/models/contest_relation_spec.rb @@ -20,8 +20,8 @@ def expected_time(relation) end end before(:all) do - @contest = FactoryGirl.create(:contest) - @relation = FactoryGirl.create(:contest_relation, :contest => @contest, :user => users(:user)) + @contest = FactoryBot.create(:contest) + @relation = FactoryBot.create(:contest_relation, :contest => @contest, :user => users(:user)) end after(:all) do @relation.destroy @@ -33,7 +33,7 @@ def expected_time(relation) @relation.should finish_at_correct_time end it "updates finish_at when contest changes" do - @anothercontest = FactoryGirl.build(:contest, :start_time => @relation.started_at.advance(:hours => -1), :end_time => @relation.started_at.advance(:hours => 1)) + @anothercontest = FactoryBot.build(:contest, :start_time => @relation.started_at.advance(:hours => -1), :end_time => @relation.started_at.advance(:hours => 1)) @relation.contest = @anothercontest @relation.should finish_at_correct_time @relation.contest_id = @contest.id diff --git a/spec/models/contest_score_spec.rb b/spec/models/contest_score_spec.rb index 93c05473..f0e55fef 100644 --- a/spec/models/contest_score_spec.rb +++ b/spec/models/contest_score_spec.rb @@ -2,15 +2,15 @@ describe ContestRelation do before(:all) do - @problem_set = FactoryGirl.build(:problem_set) - @contest = FactoryGirl.build(:contest, :duration => 5.0, :start_time => "01/01/2012 9:00:00", :end_time => "01/01/2012 18:00:00", :problem_set => @problem_set, :finalized_at => nil) - @user = FactoryGirl.create(:user, :username => "contest_score_spec.model.user") - @relation = FactoryGirl.create(:contest_relation, :contest => @contest, :user => @user, :started_at => @contest.start_time.advance(:hours => 2)) - @problem_stub = FactoryGirl.create(:problem, :problem_sets => [@problem_set]) - @submission_stub = FactoryGirl.create(:submission, :user => @user, :problem => @problem_stub, :maximum_points => 100, :points => 14, :created_at => @relation.started_at.advance(:hours => 1)) - @adding_problem = FactoryGirl.create(:adding_problem, :problem_sets => [@problem_set]) - @adding_submission = FactoryGirl.create(:adding_submission, :user => @user, :problem => @adding_problem, :created_at => @relation.started_at.advance(:hours => 1), :maximum_points => 100) - #@contestscore = FactoryGirl.create(:contest_score + @problem_set = FactoryBot.build(:problem_set) + @contest = FactoryBot.build(:contest, :duration => 5.0, :start_time => "01/01/2012 9:00:00", :end_time => "01/01/2012 18:00:00", :problem_set => @problem_set, :finalized_at => nil) + @user = FactoryBot.create(:user, :username => "contest_score_spec.model.user") + @relation = FactoryBot.create(:contest_relation, :contest => @contest, :user => @user, :started_at => @contest.start_time.advance(:hours => 2)) + @problem_stub = FactoryBot.create(:problem, :problem_sets => [@problem_set]) + @submission_stub = FactoryBot.create(:submission, :user => @user, :problem => @problem_stub, :maximum_points => 100, :points => 14, :created_at => @relation.started_at.advance(:hours => 1)) + @adding_problem = FactoryBot.create(:adding_problem, :problem_sets => [@problem_set]) + @adding_submission = FactoryBot.create(:adding_submission, :user => @user, :problem => @adding_problem, :created_at => @relation.started_at.advance(:hours => 1), :maximum_points => 100) + #@contestscore = FactoryBot.create(:contest_score end after(:all) do @adding_submission.destroy @@ -34,15 +34,15 @@ ContestScore.where(:submission_id => @submission_stub.id).count.should == 0 end it "finds submission with maximum score" do - FactoryGirl.create(:submission, :user => @user, :problem => @problem_stub, :maximum_points => 100, :points => 13, :created_at => @relation.started_at.advance(:hours => 2)) + FactoryBot.create(:submission, :user => @user, :problem => @problem_stub, :maximum_points => 100, :points => 13, :created_at => @relation.started_at.advance(:hours => 2)) ContestScore.where(:contest_relation_id => @relation.id, :problem_id => @problem_stub.id).first.try(:score).should == 14 - FactoryGirl.create(:submission, :user => @user, :problem => @problem_stub, :points => 28, :maximum_points => 50, :created_at => @relation.started_at.advance(:hours => 1.5)) + FactoryBot.create(:submission, :user => @user, :problem => @problem_stub, :points => 28, :maximum_points => 50, :created_at => @relation.started_at.advance(:hours => 1.5)) ContestScore.where(:contest_relation_id => @relation.id, :problem_id => @problem_stub.id).first.try(:score).should == 56 end it "only considers submissions during time when contest_relation is valid" do - FactoryGirl.create(:submission, :user => @user, :problem => @problem_stub, :points => 100, :maximum_points => 100, :created_at => @relation.started_at.advance(:hours => -0.5)) + FactoryBot.create(:submission, :user => @user, :problem => @problem_stub, :points => 100, :maximum_points => 100, :created_at => @relation.started_at.advance(:hours => -0.5)) ContestScore.where(:contest_relation_id => @relation.id, :problem_id => @problem_stub.id).first.try(:score).should == 14 - FactoryGirl.create(:submission, :user => @user, :problem => @problem_stub, :points => 56, :maximum_points => 100, :created_at => @relation.finish_at.advance(:hours => 0.5)) + FactoryBot.create(:submission, :user => @user, :problem => @problem_stub, :points => 56, :maximum_points => 100, :created_at => @relation.finish_at.advance(:hours => 0.5)) ContestScore.where(:contest_relation_id => @relation.id, :problem_id => @problem_stub.id).first.try(:score).should == 14 end it "has automatically updates contest_relation score and time_taken" do diff --git a/spec/models/submission_spec.rb b/spec/models/submission_spec.rb index b4a0094f..56ef3e9d 100644 --- a/spec/models/submission_spec.rb +++ b/spec/models/submission_spec.rb @@ -4,11 +4,11 @@ #pending "add some examples to (or delete) #{__FILE__}" context 'on "adding" problem' do before(:all) do - @user = FactoryGirl.create(:user) - @problem = FactoryGirl.create(:adding_problem) - @submission = FactoryGirl.create(:adding_submission, :problem => @problem, :user => @user) - @char_submission = FactoryGirl.create(:adding_char_submission, :problem => @problem, :user => @user) - @unsigned_submission = FactoryGirl.create(:adding_unsigned_submission, :problem => @problem, :user => @user) + @user = FactoryBot.create(:user) + @problem = FactoryBot.create(:adding_problem) + @submission = FactoryBot.create(:adding_submission, :problem => @problem, :user => @user) + @char_submission = FactoryBot.create(:adding_char_submission, :problem => @problem, :user => @user) + @unsigned_submission = FactoryBot.create(:adding_unsigned_submission, :problem => @problem, :user => @user) end after(:all) do [@user, @problem, @submission, @char_submission, @unsigned_submission].reverse_each { |object| object.destroy } @@ -20,8 +20,8 @@ @submission.evaluation.should == 1 end it 'judges submission on stdio problem' do - problem = FactoryGirl.create(:adding_problem_stdio) - submission = FactoryGirl.create(:adding_submission_stdio, :problem => problem, :user => @user) + problem = FactoryBot.create(:adding_problem_stdio) + submission = FactoryBot.create(:adding_submission_stdio, :problem => problem, :user => @user) submission.evaluation.should be_nil submission.judge submission.reload diff --git a/spec/policies/authorization_spec.rb b/spec/policies/authorization_spec.rb index 5f13c545..b6dc0a3e 100644 --- a/spec/policies/authorization_spec.rb +++ b/spec/policies/authorization_spec.rb @@ -8,24 +8,24 @@ @organiser = users(:organiser) @user = users(:user) # various objects to test ability on - @member = FactoryGirl.create(:user) - @group = FactoryGirl.create(:group, :members => [users(:user), users(:admin), users(:superadmin), @member]) - @organiser_group = FactoryGirl.create(:group, :owner => users(:organiser), :members => [@member]) - @private_problem = FactoryGirl.create(:problem) - @group_set = FactoryGirl.create(:problem_set, :groups => [@group]) - @everyone_set = FactoryGirl.create(:problem_set, :group_ids => [0]) - @group_problem = FactoryGirl.create(:problem, :problem_sets => [@group_set]) - @user_problem = FactoryGirl.create(:problem, :owner => users(:user)) - @admin_problem = FactoryGirl.create(:problem, :owner => users(:admin)) - @everyone_problem = FactoryGirl.create(:problem, :problem_sets => [@everyone_set]) - @contest_set = FactoryGirl.create(:problem_set) - @contest = FactoryGirl.create(:contest, :name => "Contest", :groups => [@group], :problem_set => @contest_set, :duration => 100, :start_time => DateTime.now.advance(:hours => -100), :end_time => DateTime.now.advance(:hours => 100)) - @contest_problem = FactoryGirl.create(:problem, :problem_sets => [@contest_set]) - @private_set = FactoryGirl.create(:problem_set) - @private_contest = FactoryGirl.create(:contest, :problem_set => @contest_set) - @past_contest = FactoryGirl.create(:contest, :groups => [@group], :problem_set => @contest_set, :start_time => DateTime.now.advance(:hours => -100), :end_time => DateTime.now.advance(:hours => -50)) - @future_contest = FactoryGirl.create(:contest, :groups => [@group], :problem_set => @contest_set, :start_time => DateTime.now.advance(:hours => 100), :end_time => DateTime.now.advance(:hours => 200)) - @everyone_contest = FactoryGirl.create(:contest, :group_ids => [0], :problem_set => @contest_set, :start_time => DateTime.now.advance(:hours => -100), :end_time => DateTime.now.advance(:hours => 100)) + @member = FactoryBot.create(:user) + @group = FactoryBot.create(:group, :members => [users(:user), users(:admin), users(:superadmin), @member]) + @organiser_group = FactoryBot.create(:group, :owner => users(:organiser), :members => [@member]) + @private_problem = FactoryBot.create(:problem) + @group_set = FactoryBot.create(:problem_set, :groups => [@group]) + @everyone_set = FactoryBot.create(:problem_set, :group_ids => [0]) + @group_problem = FactoryBot.create(:problem, :problem_sets => [@group_set]) + @user_problem = FactoryBot.create(:problem, :owner => users(:user)) + @admin_problem = FactoryBot.create(:problem, :owner => users(:admin)) + @everyone_problem = FactoryBot.create(:problem, :problem_sets => [@everyone_set]) + @contest_set = FactoryBot.create(:problem_set) + @contest = FactoryBot.create(:contest, :name => "Contest", :groups => [@group], :problem_set => @contest_set, :duration => 100, :start_time => DateTime.now.advance(:hours => -100), :end_time => DateTime.now.advance(:hours => 100)) + @contest_problem = FactoryBot.create(:problem, :problem_sets => [@contest_set]) + @private_set = FactoryBot.create(:problem_set) + @private_contest = FactoryBot.create(:contest, :problem_set => @contest_set) + @past_contest = FactoryBot.create(:contest, :groups => [@group], :problem_set => @contest_set, :start_time => DateTime.now.advance(:hours => -100), :end_time => DateTime.now.advance(:hours => -50)) + @future_contest = FactoryBot.create(:contest, :groups => [@group], :problem_set => @contest_set, :start_time => DateTime.now.advance(:hours => 100), :end_time => DateTime.now.advance(:hours => 200)) + @everyone_contest = FactoryBot.create(:contest, :group_ids => [0], :problem_set => @contest_set, :start_time => DateTime.now.advance(:hours => -100), :end_time => DateTime.now.advance(:hours => 100)) end after(:all) do [@member, @group, @organiser_group, @private_problem, @group_set, @everyone_set, @group_problem, @user_problem, @admin_problem, @everyone_problem, @contest_set, @contest, @contest_problem, @private_set, @private_contest, @past_contest, @future_contest, @everyone_contest].reverse_each { |obj| obj.destroy } @@ -63,7 +63,7 @@ end context 'user in contest' do before(:all) do - @relation = FactoryGirl.create(:contest_relation, :user_id => users(:user).id, :contest_id => @contest.id, :started_at => DateTime.now.advance(:hours => -1)) + @relation = FactoryBot.create(:contest_relation, :user_id => users(:user).id, :contest_id => @contest.id, :started_at => DateTime.now.advance(:hours => -1)) @contest_problem.reload @contest_user = users(:user).reload end @@ -93,7 +93,7 @@ end context 'user in contest' do before(:all) do - @relation = FactoryGirl.create(:contest_relation, :user_id => users(:user).id, :contest_id => @contest.id, :started_at => DateTime.now.advance(:hours => -1)) + @relation = FactoryBot.create(:contest_relation, :user_id => users(:user).id, :contest_id => @contest.id, :started_at => DateTime.now.advance(:hours => -1)) @contest_user = users(:user).reload # refresh .competing? end after(:all) do diff --git a/spec/support/fixtures_spec_helper.rb b/spec/support/fixtures_spec_helper.rb index 2226c933..664ed482 100644 --- a/spec/support/fixtures_spec_helper.rb +++ b/spec/support/fixtures_spec_helper.rb @@ -3,13 +3,13 @@ module FixturesSpecHelper def self.initialize @@users = { - :user => FactoryGirl.create(:user), - :organiser => FactoryGirl.create(:organiser), - :admin => FactoryGirl.create(:admin), - :superadmin => FactoryGirl.create(:superadmin) + :user => FactoryBot.create(:user), + :organiser => FactoryBot.create(:organiser), + :admin => FactoryBot.create(:admin), + :superadmin => FactoryBot.create(:superadmin) } - @@problems = { :problem => FactoryGirl.create(:problem) } - @@test_sets = { :test_set => FactoryGirl.create(:test_set, :problem => @@problems[:problem]) } + @@problems = { :problem => FactoryBot.create(:problem) } + @@test_sets = { :test_set => FactoryBot.create(:test_set, :problem => @@problems[:problem]) } end def self.destroy