Merge pull request #56 from eileencodes/fix-travis-failures

Fix travis failures

.travis.yml

@@ -1,27 +1,17 @@
 cache: bundler
 rvm:
-  - 2.2.10
-  - 2.3.8
-  - 2.4.5
   - 2.5.3
-  - 2.6.1
+  - 2.6.5
+  - 2.7.0
   - ruby-head
 gemfile:
-  - gemfiles/Gemfile-rails-5-0
-  - gemfiles/Gemfile-rails-5-1
   - gemfiles/Gemfile-rails-5-2
+  - gemfiles/Gemfile-rails-6-0
   - gemfiles/Gemfile-rails-master
 matrix:
   allow_failures:
     - rvm: ruby-head
   fast_finish: true
-  exclude:
-    - rvm: 2.2.10
-      gemfile: gemfiles/Gemfile-rails-master
-    - rvm: 2.3.8
-      gemfile: gemfiles/Gemfile-rails-master
-    - rvm: 2.4.5
-      gemfile: gemfiles/Gemfile-rails-master
 env:
   global:
     - "JRUBY_OPTS=-Xcext.enabled=true"

gemfiles/Gemfile-rails-6-0

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+gemspec path: '..'
+
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}.git" }
+
+gem 'actionpack', '~> 6.0.0', github: 'rails/rails', branch: '6-0-stable'

test/controllers/template_assertions_test.rb

@@ -12,11 +12,6 @@ def test_with_partial
     assert_template partial: '_partial'
   end
 
-  def test_file_with_absolute_path_success
-    get :render_file_absolute_path
-    assert_template file: File.expand_path('../../dummy/README.rdoc', __FILE__)
-  end
-
   def test_file_with_relative_path_success
     get :render_file_relative_path
     assert_template file: 'README.rdoc'
@@ -28,12 +23,6 @@ def test_with_file_failure
     assert_raise(ActiveSupport::TestCase::Assertion) do
       assert_template :file => 'test/hello_world'
     end
-
-    get :render_file_absolute_path
-
-    assert_raise(ActiveSupport::TestCase::Assertion) do
-      assert_template file: nil
-    end
   end
 
   def test_with_nil_passes_when_no_template_rendered

test/dummy/app/controllers/template_assertions_controller.rb

@@ -20,7 +20,7 @@ def render_file_absolute_path
   end
 
   def render_file_relative_path
-    render file: 'test/dummy/README.rdoc'
+    render file: '/test/dummy/README.rdoc'
   end
 
   def render_with_layout