Skip to content

Commit e9e61dd

Browse files
committed
[spec] refactor gem dependecies spec to not test with rdoc gem's json dependency
... json is a default gem (does not get bundled on 9.1 since the bundled version is the latest gem version)
1 parent c9b4250 commit e9e61dd

2 files changed

Lines changed: 25 additions & 8 deletions

File tree

lib/warbler/jar.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ def find_java_classes(config)
208208

209209
# Add gems to WEB-INF/gems
210210
def find_gems_files(config)
211-
unless @compiled and config.compile_gems
211+
unless @compiled && config.compile_gems
212212
config.gems.specs(config.gem_dependencies).each {|spec| find_single_gem_files(config, spec) }
213213
end
214214
end

spec/warbler/jar_spec.rb

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ def apply_extra_config(config)
338338

339339
it "collects gem files" do
340340
use_config do |config|
341-
config.gems << "rake"
341+
config.gems << 'rake'
342342
end
343343
jar.apply(config)
344344
file_list(%r{WEB-INF/gems/gems/rake.*/lib/rake.rb}).should_not be_empty
@@ -347,22 +347,39 @@ def apply_extra_config(config)
347347

348348
it "collects gem files with dependencies" do
349349
use_config do |config|
350-
config.gems << "rdoc"
350+
config.gems << 'virtus'
351351
config.gem_dependencies = true
352352
end
353353
jar.apply(config)
354-
file_list(%r{WEB-INF/gems/gems/json.*/lib/json.rb}).should_not be_empty
355-
file_list(%r{WEB-INF/gems/specifications/json.*\.gemspec}).should_not be_empty
354+
file_list(%r{WEB-INF/gems/gems/axiom-types.*/lib}).should_not be_empty
355+
file_list(%r{WEB-INF/gems/specifications/axiom-types.*\.gemspec}).should_not be_empty
356+
file_list(%r{WEB-INF/gems/gems/equalizer.*/lib/equalizer/version.rb$}).should_not be_empty
357+
# NOTE: rdoc is tricky as its dependency json is a default gem
358+
#use_config do |config|
359+
# config.gems << "rdoc"
360+
# config.gem_dependencies = true
361+
#end
362+
#jar.apply(config)
363+
#file_list(%r{WEB-INF/gems/gems/json.*/lib/json.rb}).should_not be_empty
364+
#file_list(%r{WEB-INF/gems/specifications/json.*\.gemspec}).should_not be_empty
356365
end
357366

358367
it "collects gem files without dependencies" do
359368
use_config do |config|
360-
config.gems << "rdoc"
369+
config.gems << 'virtus'
361370
config.gem_dependencies = false
362371
end
363372
jar.apply(config)
364-
file_list(%r{WEB-INF/gems/gems/json.*/lib/json.rb}).should be_empty
365-
file_list(%r{WEB-INF/gems/specifications/json.*\.gemspec}).should be_empty
373+
file_list(%r{WEB-INF/gems/gems/axiom-types.*/lib}).should be_empty
374+
file_list(%r{WEB-INF/gems/specifications/axiom-types.*\.gemspec}).should be_empty
375+
file_list(%r{WEB-INF/gems/gems/equalizer.*/lib/equalizer/version.rb$}).should be_empty
376+
#use_config do |config|
377+
# config.gems << "rdoc"
378+
# config.gem_dependencies = false
379+
#end
380+
#jar.apply(config)
381+
#file_list(%r{WEB-INF/gems/gems/json.*/lib/json.rb}).should be_empty
382+
#file_list(%r{WEB-INF/gems/specifications/json.*\.gemspec}).should be_empty
366383
end
367384

368385
it "adds ENV['GEM_HOME'] to init.rb" do

0 commit comments

Comments
 (0)