summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Bundler Bot <bot@bundler.io>2018-08-20 10:47:43 +0000
committerColby Swandale <hello@colby.fyi>2018-08-20 21:37:30 +1000
commite35408f459f345f39625a592a3eb85647d2be88c (patch)
tree5b4e6c62dcbf654178d127f0e8b818b1bb39cd4a
parent2144f52c8a7906232a09564382742697aa44c722 (diff)
downloadbundler-e35408f459f345f39625a592a3eb85647d2be88c.tar.gz
Auto merge of #6668 - eregon:fix-encoding-spec-from-6661, r=deivid-rodriguez
Fix encoding spec from #6661 to also work 1.9.3 * String#b is Ruby 2.0+. ### What was the problem that led to this PR? The CI is failing on the `1-16-stable` branch. ### What was your diagnosis of the problem? The CI on master doesn't run against MRI 1.9.3, so this failure slipped in in #6661. Probably testing against MRI 1.9.3 should be done on `master` too? ### What is your fix for the problem, implemented in this PR? Make the spec work on 1.9.3. cc @hsbt (cherry picked from commit 72f27b0dd8c92159bf769a531cfa97672bf4c1e4)
-rw-r--r--spec/install/gemfile_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/install/gemfile_spec.rb b/spec/install/gemfile_spec.rb
index bdb93b2433..5961bcbfbd 100644
--- a/spec/install/gemfile_spec.rb
+++ b/spec/install/gemfile_spec.rb
@@ -132,7 +132,7 @@ RSpec.describe "bundle install" do
# NOTE: This works thanks to #eval interpreting the magic encoding comment
install_gemfile <<-G
# encoding: iso-8859-1
- str = "Il #{"\xE9".b}tait une fois ..."
+ str = "Il #{"\xE9".dup.force_encoding("binary")}tait une fois ..."
puts "The source encoding is: " + str.encoding.name
G