diff --git a/rails_utils.gemspec b/rails_utils.gemspec index 2a53def..7cdd3ef 100644 --- a/rails_utils.gemspec +++ b/rails_utils.gemspec @@ -20,8 +20,7 @@ Gem::Specification.new do |s| # Attempted to upgrade minitest to v5.0.6 on 22 Aug. Failed because turn v0.9.6 has a mismatched adapter to minitest v5.0.6 # https://github.com/TwP/turn/issues/122 - s.add_development_dependency "minitest" , "~> 4.7.5" - s.add_development_dependency "turn" , "~> 0.9.6" + s.add_development_dependency "minitest" , "~> 5.1" s.add_development_dependency "mocha" , "~> 0.14.0" s.license = 'MIT' diff --git a/test/dummy/config/application.rb b/test/dummy/config/application.rb index 8fd918c..9d3066a 100644 --- a/test/dummy/config/application.rb +++ b/test/dummy/config/application.rb @@ -55,10 +55,10 @@ class Application < Rails::Application # config.active_record.whitelist_attributes = true # Enable the asset pipeline - config.assets.enabled = true + # config.assets.enabled = true # Version of your assets, change this if you want to expire all your assets - config.assets.version = '1.0' + # config.assets.version = '1.0' end end diff --git a/test/rails_utils_test.rb b/test/rails_utils_test.rb index 297abf3..836c426 100644 --- a/test/rails_utils_test.rb +++ b/test/rails_utils_test.rb @@ -1,4 +1,5 @@ require 'test_helper' +# require 'rspec/rails' describe "RailsUtils::ActionViewExtensions" do let(:controller) { ActionController::Base.new } @@ -231,11 +232,11 @@ def set_flash(key, message) before { set_flash key, expected_message } it "prints class '#{expected_class}'" do - view.flash_messages.must_match expected_class + _(view.flash_messages).must_match expected_class end it "prints message '#{expected_message}'" do - view.flash_messages.must_match expected_message + _(view.flash_messages).must_match expected_message end end end @@ -243,26 +244,26 @@ def set_flash(key, message) describe "when bootstrap is present" do it "can fade in and out" do set_flash :alert, "not important" - view.flash_messages.must_match /fade in/ + _(view.flash_messages).must_match /fade in/ end it "can be dismissed" do set_flash :alert, "not important" - view.flash_messages.must_match /data-dismiss=.*alert/ + _(view.flash_messages).must_match /data-dismiss=.*alert/ end end describe "options" do it "can allow override of button content (default 'x')" do set_flash :alert, "not important" - view.flash_messages.must_match %r{>x} - view.flash_messages(button_html: '').must_match %r{button class="close"} + _(view.flash_messages).must_match %r{>x} + view.flash_messages(button_html: '').must_match %r{class="close"} end it "can allow override of button css class (default 'close')" do set_flash :alert, "not important" view.flash_messages.must_match %r{>x} - view.flash_messages(button_class: 'abc def').must_match %r{button class="abc def"} + view.flash_messages(button_class: 'abc def').must_match %r{class="abc def"} end end @@ -286,7 +287,7 @@ def set_flash(key, message) message.expect :html_safe?, true end - view.flash_messages.must_equal "