Skip to content

Fix travis failures #56

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
May 5, 2020
Merged

Fix travis failures #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d08814b
Add ability to test Rails 6.0
eileencodes Apr 16, 2020
bf3d495
Add 6.0 and remove EOL Rails and Ruby
eileencodes Apr 16, 2020
54f2240
Fix `render: file` call
eileencodes Apr 16, 2020
9acf9b7
Delete render file tests
eileencodes May 4, 2020
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
16 changes: 3 additions & 13 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
4 changes: 0 additions & 4 deletions gemfiles/Gemfile-rails-5-0
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions gemfiles/Gemfile-rails-5-1
View file
Open in desktop

This file was deleted.

6 changes: 6 additions & 0 deletions gemfiles/Gemfile-rails-6-0
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
11 changes: 0 additions & 11 deletions test/controllers/template_assertions_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/dummy/app/controllers/template_assertions_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down