diff --git a/.travis.yml b/.travis.yml index d95af81..47cd6ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,3 @@ gemfile: branches: only: - master -matrix: - allow_failures: - - gemfile: gemfiles/rails_master.gemfile diff --git a/test/test_actionview-link_to_blank.rb b/test/test_actionview-link_to_blank.rb index 5d5d302..c1ff50a 100644 --- a/test/test_actionview-link_to_blank.rb +++ b/test/test_actionview-link_to_blank.rb @@ -131,6 +131,7 @@ def test_link_tag_with_javascript_confirm def test_link_tag_with_deprecated_confirm skip('Not deprecate in Rails3.2') if ActionPack::VERSION::MAJOR == 3 + skip('Remove in Rails4.1') if ActionPack::VERSION::MAJOR == 4 && ActionPack::VERSION::MINOR >= 1 assert_deprecated ":confirm option is deprecated and will be removed from Rails 4.1. Use 'data: { confirm: \'Text\' }' instead" do assert_dom_equal( %{Hello}, @@ -216,6 +217,7 @@ def test_link_tag_using_post_javascript_and_confirm def test_link_tag_using_post_javascript_and_with_deprecated_confirm skip('Not deprecate in Rails3.2') if ActionPack::VERSION::MAJOR == 3 + skip('Remove in Rails4.1') if ActionPack::VERSION::MAJOR == 4 && ActionPack::VERSION::MINOR >= 1 assert_deprecated ":confirm option is deprecated and will be removed from Rails 4.1. Use 'data: { confirm: \'Text\' }' instead" do assert_dom_equal( %{Hello}, @@ -233,6 +235,7 @@ def test_link_tag_using_delete_javascript_and_href_and_confirm def test_link_tag_using_delete_javascript_and_href_and_with_deprecated_confirm skip('Not deprecate in Rails3.2') if ActionPack::VERSION::MAJOR == 3 + skip('Remove in Rails4.1') if ActionPack::VERSION::MAJOR == 4 && ActionPack::VERSION::MINOR >= 1 assert_deprecated ":confirm option is deprecated and will be removed from Rails 4.1. Use 'data: { confirm: \'Text\' }' instead" do assert_dom_equal( %{Destroy},