Skip to content

Added workaround for Ruby core repository. #609

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 2 commits into from
Mar 20, 2018
Merged

Added workaround for Ruby core repository. #609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f810c4
Added workaround for Ruby core repository.
hsbt Mar 20, 2018
ab753aa
Ignore JRuby matrix on Travis
hsbt Mar 20, 2018
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: 3 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,6 @@ env:
global:
NOBENCHMARK=1
script: rake
matrix:
allow_failures:
- rvm: jruby-9.1.16.0
8 changes: 7 additions & 1 deletion test/test_rdoc_generator_json_index.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,13 @@ def test_generate
assert_file 'js/navigation.js'
assert_file 'js/search_index.js'

orig_file = Pathname(File.join @pwd, 'lib/rdoc/generator/template/json_index/js/navigation.js')
srcdir = File.expand_path("../../lib/rdoc", __FILE__)
if !File.directory? srcdir
# for Ruby core repository
srcdir = File.expand_path("../../../lib/rdoc", __FILE__)
end

orig_file = Pathname(File.join srcdir, 'generator/template/json_index/js/navigation.js')
generated_file = Pathname(File.join @tmpdir, 'js/navigation.js')

# This is dirty hack on JRuby for MiniTest 4
Expand Down