Skip to content

Commit 97f5681

Browse files
joerixaopolleolleolle
authored andcommitted
Prevent warnings about missing explicit source
This only affects the specs.
1 parent fe0171b commit 97f5681

2 files changed

Lines changed: 9 additions & 9 deletions

File tree

spec/spec_helper.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ def generate_gem(gem_name, gem_dir = Dir.mktmpdir("#{gem_name}-#{Time.now.to_f}"
171171
# create the gemspec and Gemfile
172172
File.open("Gemfile", "w") do |f|
173173
f << <<-RUBY
174-
source "http://rubygems.org/"
174+
source "https://rubygems.org/"
175175
gemspec
176176
RUBY
177177
end

spec/warbler/bundler_spec.rb

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def bundle_install(*args)
3333
cleanup_temp_files
3434

3535
before :each do
36-
File.open("Gemfile", "w") {|f| f << "gem 'rspec'"}
36+
File.open("Gemfile", "w") {|f| f << "source 'https://rubygems.org'\ngem 'rspec'"}
3737
end
3838

3939
it "detects a Bundler trait" do
@@ -69,15 +69,15 @@ def bundle_install(*args)
6969
create_git_gem("tester")
7070

7171
it "works with :git entries in Gemfiles" do
72-
File.open("Gemfile", "w") {|f| f << "gem 'tester', :git => '#{@gem_dir}'\n"}
72+
File.open("Gemfile", "w") {|f| f << "source 'file://#{@gem_dir}'\ngem 'tester', :git => '#{@gem_dir}'\n"}
7373
bundle_install '--local'
7474
jar.apply(config)
7575
expect(file_list(%r{WEB-INF/gems/bundler/gems/tester[^/]*/lib/tester/version\.rb})).to_not be_empty
7676
expect(file_list(%r{WEB-INF/gems/bundler/gems/tester[^/]*/tester.gemspec})).to_not be_empty
7777
end
7878

7979
it "bundles only the gemspec for :git entries that are excluded" do
80-
File.open("Gemfile", "w") {|f| f << "gem 'rake'\ngroup :test do\ngem 'tester', :git => '#{@gem_dir}'\nend\n"}
80+
File.open("Gemfile", "w") {|f| f << "source 'https://rubygems.org'\ngem 'rake'\ngroup :test do\ngem 'tester', :git => '#{@gem_dir}'\nend\n"}
8181
bundle_install '--local'
8282
jar.apply(config)
8383
expect(file_list(%r{WEB-INF/gems/bundler/gems/tester[^/]*/lib/tester/version\.rb})).to be_empty
@@ -92,7 +92,7 @@ def bundle_install(*args)
9292

9393
it "does not work with absolute :path" do
9494
@gem_dir = generate_gem('tester', Dir.mktmpdir("gems-#{Time.now.to_i}"))
95-
File.open("Gemfile", "w") {|f| f << "gem 'tester', :path => '#{@gem_dir}'\n"}
95+
File.open("Gemfile", "w") {|f| f << "source 'file://#{@gem_dir}'\ngem 'tester', :path => '#{@gem_dir}'\n"}
9696
bundle_install '--local'
9797
silence { jar.apply(config) }
9898
expect(file_list(%r{tester})).to be_empty
@@ -103,7 +103,7 @@ def bundle_install(*args)
103103
#begin
104104
Dir.mkdir(gem_dir)
105105
@gem_dir = generate_gem('tester', 'gems/tester') # spec/sample_war/gems
106-
File.open("Gemfile", "w") {|f| f << "gem 'rake'\ngem 'tester', :path => 'gems/tester'\n"}
106+
File.open("Gemfile", "w") {|f| f << "source 'https://rubygems.org'\ngem 'rake'\ngem 'tester', :path => 'gems/tester'\n"}
107107
bundle_install '--local'
108108
jar.apply(config)
109109
expect(file_list(%r{tester})).to_not be_empty # included from :path as is
@@ -117,7 +117,7 @@ def bundle_install(*args)
117117
end
118118

119119
it "does not bundle dependencies in the test group by default" do
120-
File.open("Gemfile", "w") {|f| f << "gem 'rake'\ngroup :test do\ngem 'rspec'\nend\n"}
120+
File.open("Gemfile", "w") {|f| f << "source 'https://rubygems.org'\ngem 'rake'\ngroup :test do\ngem 'rspec'\nend\n"}
121121
jar.apply(config)
122122
expect(file_list(%r{WEB-INF/gems/gems/rake[^/]*/})).to_not be_empty
123123
expect(file_list(%r{WEB-INF/gems/gems/rspec[^/]*/})).to be_empty
@@ -153,7 +153,7 @@ def bundle_install(*args)
153153
create_git_gem("tester")
154154

155155
it "works with :git entries in Gemfiles" do
156-
File.open("Gemfile", "w") {|f| f << "gem 'tester', :git => '#{@gem_dir}'\n"}
156+
File.open("Gemfile", "w") {|f| f << "source 'file://#{@gem_dir}'\ngem 'tester', :git => '#{@gem_dir}'\n"}
157157
bundle_install '--local'
158158
jar.apply(config)
159159
expect(file_list(%r{^bundler/gems/tester[^/]*/lib/tester/version\.rb})).to_not be_empty
@@ -165,7 +165,7 @@ def bundle_install(*args)
165165
end
166166

167167
it "adds BUNDLE_GEMFILE to init.rb" do
168-
File.open("Gemfile", "w") {|f| f << "source 'http://rubygems.org/'" }
168+
File.open("Gemfile", "w") {|f| f << "source 'https://rubygems.org/'" }
169169
jar.add_init_file(config)
170170
contents = jar.contents('META-INF/init.rb')
171171
expect(contents).to match /ENV\['BUNDLE_GEMFILE'\] = File.expand_path(.*, __FILE__)/

0 commit comments

Comments
 (0)