diff --git a/Gemfile b/Gemfile index bd5d9ab..64cb4fe 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ source 'https://rubygems.org' gem 'figaro', '~> 1.1.1' gem 'bcrypt', '~> 3.1.7' gem 'mysql2', '>= 0.3.18', '< 0.5' -gem 'rails', '~> 5.0', '>= 5.0.0.1' +gem 'rails', '~> 5.0', '>= 5.0.1' gem 'jbuilder', '~> 2.6' gem 'jquery-rails' diff --git a/Gemfile.lock b/Gemfile.lock index 589a2b6..fea4f78 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,46 +1,47 @@ GEM remote: https://rubygems.org/ specs: - actioncable (5.0.0.1) - actionpack (= 5.0.0.1) + actioncable (5.0.1) + actionpack (= 5.0.1) nio4r (~> 1.2) websocket-driver (~> 0.6.1) - actionmailer (5.0.0.1) - actionpack (= 5.0.0.1) - actionview (= 5.0.0.1) - activejob (= 5.0.0.1) + actionmailer (5.0.1) + actionpack (= 5.0.1) + actionview (= 5.0.1) + activejob (= 5.0.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.0.0.1) - actionview (= 5.0.0.1) - activesupport (= 5.0.0.1) + actionpack (5.0.1) + actionview (= 5.0.1) + activesupport (= 5.0.1) rack (~> 2.0) rack-test (~> 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.0.0.1) - activesupport (= 5.0.0.1) + actionview (5.0.1) + activesupport (= 5.0.1) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - activejob (5.0.0.1) - activesupport (= 5.0.0.1) + activejob (5.0.1) + activesupport (= 5.0.1) globalid (>= 0.3.6) - activemodel (5.0.0.1) - activesupport (= 5.0.0.1) - activerecord (5.0.0.1) - activemodel (= 5.0.0.1) - activesupport (= 5.0.0.1) + activemodel (5.0.1) + activesupport (= 5.0.1) + activerecord (5.0.1) + activemodel (= 5.0.1) + activesupport (= 5.0.1) arel (~> 7.0) - activesupport (5.0.0.1) + activesupport (5.0.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (~> 0.7) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.4.0) + addressable (2.5.0) + public_suffix (~> 2.0, >= 2.0.2) ansi (1.5.0) - arel (7.1.1) + arel (7.1.4) ast (2.3.0) awesome_print (1.7.0) bcrypt (3.1.11) @@ -53,29 +54,29 @@ GEM bourbon (4.2.7) sass (~> 3.4) thor (~> 0.19) - brakeman (3.4.0) + brakeman (3.4.1) builder (3.2.2) - byebug (9.0.5) + byebug (9.0.6) choice (0.2.0) coderay (1.1.1) - concurrent-ruby (1.0.2) - css_parser (1.4.5) + concurrent-ruby (1.0.4) + css_parser (1.4.7) addressable debug_inspector (0.0.2) docile (1.1.5) - domain_name (0.5.20160615) + domain_name (0.5.20161129) unf (>= 0.0.5, < 1.0.0) em-websocket (0.5.1) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) erubis (2.7.0) - eventmachine (1.2.0.1) + eventmachine (1.2.1) execjs (2.7.0) ffi (1.9.14) figaro (1.1.1) thor (~> 0.14) formatador (0.2.5) - foundation_emails (2.2.0.0) + foundation_emails (2.2.1.0) globalid (0.3.7) activesupport (>= 4.1.0) guard (2.14.0) @@ -106,27 +107,28 @@ GEM guard (>= 2.0.0) guard-compat (~> 1.0) htmlentities (4.3.4) - http-cookie (1.0.2) + http-cookie (1.0.3) domain_name (~> 0.5) http_parser.rb (0.6.0) i18n (0.7.0) - inky-rb (1.3.6.1) + inky-rb (1.3.7.2) foundation_emails (~> 2) - jbuilder (2.6.0) + nokogiri + jbuilder (2.6.1) activesupport (>= 3.0.0, < 5.1) multi_json (~> 1.2) - jquery-rails (4.2.1) + jquery-rails (4.2.2) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (2.0.2) + json (2.0.3) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) ruby_dep (~> 1.2) loofah (2.0.3) nokogiri (>= 1.5.9) - lumberjack (1.0.10) + lumberjack (1.0.11) mail (2.6.4) mime-types (>= 1.16, < 4) mailjet (1.3.8) @@ -138,29 +140,27 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) mini_portile2 (2.1.0) - minitest (5.9.0) - minitest-reporters (1.1.11) + minitest (5.10.1) + minitest-reporters (1.1.13) ansi builder minitest (>= 5.0) ruby-progressbar multi_json (1.12.1) - mysql2 (0.4.4) + mysql2 (0.4.5) neat (1.8.0) sass (>= 3.3) thor (~> 0.19) nenv (0.3.0) netrc (0.11.0) nio4r (1.2.1) - nokogiri (1.6.8) + nokogiri (1.7.0.1) mini_portile2 (~> 2.1.0) - pkg-config (~> 1.1.7) notiffany (0.1.1) nenv (~> 0.1) shellany (~> 0.0) - parser (2.3.1.2) + parser (2.3.3.1) ast (~> 2.2) - pkg-config (1.1.7) policy-assertions (0.0.3) activesupport (>= 3.0.0) pundit (>= 1.0.0) @@ -168,19 +168,20 @@ GEM premailer (1.8.7) css_parser (>= 1.4.5) htmlentities (>= 4.0.0) - premailer-rails (1.9.4) + premailer-rails (1.9.5) actionmailer (>= 3, < 6) premailer (~> 1.7, >= 1.7.9) pry (0.10.4) coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) - pry-byebug (3.4.0) + pry-byebug (3.4.2) byebug (~> 9.0) pry (~> 0.10) pry-rails (0.3.4) pry (>= 0.9.10) - puma (3.6.0) + public_suffix (2.0.5) + puma (3.6.2) pundit (1.1.0) activesupport (>= 3.0.0) rack (2.0.1) @@ -188,25 +189,25 @@ GEM rack rack-test (0.6.3) rack (>= 1.0) - rails (5.0.0.1) - actioncable (= 5.0.0.1) - actionmailer (= 5.0.0.1) - actionpack (= 5.0.0.1) - actionview (= 5.0.0.1) - activejob (= 5.0.0.1) - activemodel (= 5.0.0.1) - activerecord (= 5.0.0.1) - activesupport (= 5.0.0.1) + rails (5.0.1) + actioncable (= 5.0.1) + actionmailer (= 5.0.1) + actionpack (= 5.0.1) + actionview (= 5.0.1) + activejob (= 5.0.1) + activemodel (= 5.0.1) + activerecord (= 5.0.1) + activesupport (= 5.0.1) bundler (>= 1.3.0, < 2.0) - railties (= 5.0.0.1) + railties (= 5.0.1) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.1) actionpack (~> 5.x) actionview (~> 5.x) activesupport (~> 5.x) - rails-dom-testing (2.0.1) + rails-dom-testing (2.0.2) activesupport (>= 4.2.0, < 6.0) - nokogiri (~> 1.6.0) + nokogiri (~> 1.6) rails-erd (1.5.0) activerecord (>= 3.2) activesupport (>= 3.2) @@ -214,15 +215,15 @@ GEM ruby-graphviz (~> 1.2) rails-html-sanitizer (1.0.3) loofah (~> 2.0) - railties (5.0.0.1) - actionpack (= 5.0.0.1) - activesupport (= 5.0.0.1) + railties (5.0.1) + actionpack (= 5.0.1) + activesupport (= 5.0.1) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rainbow (2.1.0) - rake (11.2.2) - rb-fsevent (0.9.7) + rainbow (2.2.1) + rake (12.0.0) + rb-fsevent (0.9.8) rb-inotify (0.9.7) ffi (>= 0.5.0) rest-client (2.0.0) @@ -237,8 +238,8 @@ GEM unicode-display_width (~> 1.0, >= 1.0.1) ruby-graphviz (1.2.2) ruby-progressbar (1.8.1) - ruby_dep (1.4.0) - sass (3.4.22) + ruby_dep (1.5.0) + sass (3.4.23) sass-rails (5.0.6) railties (>= 4.0.0, < 6) sass (~> 3.1) @@ -253,18 +254,19 @@ GEM simplecov-html (~> 0.10.0) simplecov-html (0.10.0) slop (3.6.0) - spring (1.7.2) - spring-watcher-listen (2.0.0) + spring (2.0.0) + activesupport (>= 4.2) + spring-watcher-listen (2.0.1) listen (>= 2.7, < 4.0) - spring (~> 1.2) - sprockets (3.7.0) + spring (>= 1.2, < 3.0) + sprockets (3.7.1) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.1.1) + sprockets-rails (3.2.0) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - thor (0.19.1) + thor (0.19.4) thread_safe (0.3.5) tilt (2.0.5) turbolinks (5.0.1) @@ -272,13 +274,13 @@ GEM turbolinks-source (5.0.0) tzinfo (1.2.2) thread_safe (~> 0.1) - uglifier (3.0.2) + uglifier (3.0.4) execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext unf_ext (0.0.7.2) - unicode-display_width (1.1.1) - web-console (3.3.1) + unicode-display_width (1.1.2) + web-console (3.4.0) actionview (>= 5.0) activemodel (>= 5.0) debug_inspector @@ -321,7 +323,7 @@ DEPENDENCIES puma (~> 3.0) pundit rack-livereload - rails (~> 5.0, >= 5.0.0.1) + rails (~> 5.0, >= 5.0.1) rails-controller-testing rails-erd rubocop (~> 0.42.0) @@ -336,4 +338,4 @@ DEPENDENCIES web-console BUNDLED WITH - 1.12.5 + 1.13.2 diff --git a/test/test_helper.rb b/test/test_helper.rb index 65a1a33..108c430 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -19,6 +19,7 @@ Dir[Rails.root.join("test/test_helpers/**/*.rb")].each { |f| require f } Minitest::Reporters.use! [Minitest::Reporters::DefaultReporter.new(color: true)] class ActiveSupport::TestCase + ActiveRecord::Migration.maintain_test_schema! ActiveRecord::Migration.check_pending! # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. diff --git a/test/workers/quiz_status_test.rb b/test/workers/quiz_status_test.rb index f79b299..ea52280 100644 --- a/test/workers/quiz_status_test.rb +++ b/test/workers/quiz_status_test.rb @@ -97,7 +97,7 @@ class QuizStatusTest < ActiveSupport::TestCase dawn = candidates :dawn status = QuizStatus.new dawn - assert_equal nil, status.current_question_id + assert_nil status.current_question_id end test "richard has no_finish_laters" do