Skip to content

remove turn #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions rails_utils.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions test/dummy/config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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

17 changes: 9 additions & 8 deletions test/rails_utils_test.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
require 'test_helper'
# require 'rspec/rails'

describe "RailsUtils::ActionViewExtensions" do
let(:controller) { ActionController::Base.new }
Expand Down Expand Up @@ -231,38 +232,38 @@ 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

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</button>}
view.flash_messages(button_html: '').must_match %r{button class="close"}
_(view.flash_messages).must_match %r{>x</button>}
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</button>}
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

Expand All @@ -286,7 +287,7 @@ def set_flash(key, message)
message.expect :html_safe?, true
end

view.flash_messages.must_equal "<div class=\"alert alert-danger alert-error fade in \"><button class=\"close\" data-dismiss=\"alert\" type=\"button\">x</button>test</div>"
view.flash_messages.must_equal "<div class=\"alert alert-danger alert-error fade in \"><button type=\"button\" class=\"close\" data-dismiss=\"alert\">x</button>test</div>"
end
end
end
6 changes: 1 addition & 5 deletions test/test_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,7 @@

require File.expand_path("../dummy/config/environment.rb", __FILE__)
require 'minitest/autorun'
begin
require 'turn/autorun'
rescue LoadError
puts 'You must `gem install turn` and `bundle install` to run tests with turn'
end
require 'mocha/setup'

Rails.backtrace_cleaner.remove_silencers!

Expand Down