Skip to content

Commit 684f329

Browse files
committed
Fixed broken test with autoload on JRuby
1 parent 5e3bafb commit 684f329

File tree

4 files changed

+6
-8
lines changed

4 files changed

+6
-8
lines changed

.travis.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,8 @@ rvm:
99
- 2.4.3
1010
- 2.5.0
1111
- ruby-head
12+
- jruby-9.1.15.0
1213
env:
1314
global:
1415
NOBENCHMARK=1
1516
script: rake
16-
matrix:
17-
allow_failures:
18-
- rvm: jruby-9.1.15.0

lib/rdoc.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ def self.load_yaml
153153

154154
autoload :Comment, 'rdoc/comment'
155155

156-
autoload :I18n, 'rdoc/i18n'
156+
require 'rdoc/i18n'
157157

158158
# code objects
159159
#

lib/rdoc/generator/pot.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ def extract_messages
9191
extractor.extract
9292
end
9393

94-
autoload :MessageExtractor, 'rdoc/generator/pot/message_extractor'
95-
autoload :PO, 'rdoc/generator/pot/po'
96-
autoload :POEntry, 'rdoc/generator/pot/po_entry'
94+
require 'rdoc/generator/pot/message_extractor'
95+
require 'rdoc/generator/pot/po'
96+
require 'rdoc/generator/pot/po_entry'
9797

9898
end

lib/rdoc/i18n.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
module RDoc::I18n
66

77
autoload :Locale, 'rdoc/i18n/locale'
8-
autoload :Text, 'rdoc/i18n/text'
8+
require 'rdoc/i18n/text'
99

1010
end

0 commit comments

Comments
 (0)