Merge pull request #6670 from rubygems/cherry-pick-core-changes

deivid-rodriguez · web-flow · commit 5d4642ad1555 · 2023-05-09T20:55:44.000+02:00
Cherry-pick ruby-core changes
diff --git a/bundler/spec/commands/info_spec.rb b/bundler/spec/commands/info_spec.rb
@@ -215,7 +215,7 @@
       G
 
       bundle "info rac"
-      expect(out).to match(/\A1 : rack\n2 : rack-obama\n0 : - exit -(\n>)?\z/)
+      expect(out).to match(/\A1 : rack\n2 : rack-obama\n0 : - exit -(\n>.*)?\z/)
     end
   end
 
diff --git a/bundler/spec/commands/show_spec.rb b/bundler/spec/commands/show_spec.rb
@@ -173,7 +173,7 @@
       G
 
       bundle "show rac"
-      expect(out).to match(/\A1 : rack\n2 : rack-obama\n0 : - exit -(\n>)?\z/)
+      expect(out).to match(/\A1 : rack\n2 : rack-obama\n0 : - exit -(\n>.*)?\z/)
     end
   end
 

Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@`
`215`	`215`	`G`
`216`	`216`
`217`	`217`	`bundle "info rac"`
`218`		`- expect(out).to match(/\A1 : rack\n2 : rack-obama\n0 : - exit -(\n>)?\z/)`
	`218`	`+ expect(out).to match(/\A1 : rack\n2 : rack-obama\n0 : - exit -(\n>.*)?\z/)`
`219`	`219`	`end`
`220`	`220`	`end`
`221`	`221`
Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@`
`173`	`173`	`G`
`174`	`174`
`175`	`175`	`bundle "show rac"`
`176`		`- expect(out).to match(/\A1 : rack\n2 : rack-obama\n0 : - exit -(\n>)?\z/)`
	`176`	`+ expect(out).to match(/\A1 : rack\n2 : rack-obama\n0 : - exit -(\n>.*)?\z/)`
`177`	`177`	`end`
`178`	`178`	`end`
`179`	`179`