Skip to content

Commit 6f07f82

Browse files
authored
Merge pull request #56 from eileencodes/fix-travis-failures
Fix travis failures
2 parents 3c3781d + 9acf9b7 commit 6f07f82

File tree

6 files changed

+10
-33
lines changed

6 files changed

+10
-33
lines changed

.travis.yml

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,17 @@
11
cache: bundler
22
rvm:
3-
- 2.2.10
4-
- 2.3.8
5-
- 2.4.5
63
- 2.5.3
7-
- 2.6.1
4+
- 2.6.5
5+
- 2.7.0
86
- ruby-head
97
gemfile:
10-
- gemfiles/Gemfile-rails-5-0
11-
- gemfiles/Gemfile-rails-5-1
128
- gemfiles/Gemfile-rails-5-2
9+
- gemfiles/Gemfile-rails-6-0
1310
- gemfiles/Gemfile-rails-master
1411
matrix:
1512
allow_failures:
1613
- rvm: ruby-head
1714
fast_finish: true
18-
exclude:
19-
- rvm: 2.2.10
20-
gemfile: gemfiles/Gemfile-rails-master
21-
- rvm: 2.3.8
22-
gemfile: gemfiles/Gemfile-rails-master
23-
- rvm: 2.4.5
24-
gemfile: gemfiles/Gemfile-rails-master
2515
env:
2616
global:
2717
- "JRUBY_OPTS=-Xcext.enabled=true"

gemfiles/Gemfile-rails-5-0

Lines changed: 0 additions & 4 deletions
This file was deleted.

gemfiles/Gemfile-rails-5-1

Lines changed: 0 additions & 4 deletions
This file was deleted.

gemfiles/Gemfile-rails-6-0

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
source 'https://rubygems.org'
2+
gemspec path: '..'
3+
4+
git_source(:github) { |repo_name| "https://github.com/#{repo_name}.git" }
5+
6+
gem 'actionpack', '~> 6.0.0', github: 'rails/rails', branch: '6-0-stable'

test/controllers/template_assertions_test.rb

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,6 @@ def test_with_partial
1212
assert_template partial: '_partial'
1313
end
1414

15-
def test_file_with_absolute_path_success
16-
get :render_file_absolute_path
17-
assert_template file: File.expand_path('../../dummy/README.rdoc', __FILE__)
18-
end
19-
2015
def test_file_with_relative_path_success
2116
get :render_file_relative_path
2217
assert_template file: 'README.rdoc'
@@ -28,12 +23,6 @@ def test_with_file_failure
2823
assert_raise(ActiveSupport::TestCase::Assertion) do
2924
assert_template :file => 'test/hello_world'
3025
end
31-
32-
get :render_file_absolute_path
33-
34-
assert_raise(ActiveSupport::TestCase::Assertion) do
35-
assert_template file: nil
36-
end
3726
end
3827

3928
def test_with_nil_passes_when_no_template_rendered

test/dummy/app/controllers/template_assertions_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def render_file_absolute_path
2020
end
2121

2222
def render_file_relative_path
23-
render file: 'test/dummy/README.rdoc'
23+
render file: '/test/dummy/README.rdoc'
2424
end
2525

2626
def render_with_layout

0 commit comments

Comments
 (0)