|
10 | 10 | gem "foo", :git => "#{lib_path("foo")}" |
11 | 11 | G |
12 | 12 |
|
13 | | - expect(out).to include("Using foo 1.0 from #{lib_path("foo")} (at main@#{revision_for(lib_path("foo"))[0..6]})") |
| 13 | + expect(out).to include("Using foo 1.0 from #{lib_path("foo")} (at #{revision_for(lib_path("foo"))[0..6]})") |
14 | 14 | expect(the_bundle).to include_gems "foo 1.0", source: "git@#{lib_path("foo")}" |
15 | 15 | end |
16 | 16 |
|
|
23 | 23 | gem "foo", :git => "#{relative_path}" |
24 | 24 | G |
25 | 25 |
|
26 | | - expect(out).to include("Using foo 1.0 from #{relative_path} (at main@#{revision_for(lib_path("foo"))[0..6]})") |
| 26 | + expect(out).to include("Using foo 1.0 from #{relative_path} (at #{revision_for(lib_path("foo"))[0..6]})") |
27 | 27 | expect(the_bundle).to include_gems "foo 1.0", source: "git@#{lib_path("foo")}" |
28 | 28 | end |
29 | 29 |
|
|
35 | 35 | gem "foo", :git => "#{lib_path("foo")}" |
36 | 36 | G |
37 | 37 |
|
38 | | - expect(out).to include("Using foo 1.0 from #{lib_path("foo")} (at non-standard@#{revision_for(lib_path("foo"))[0..6]})") |
| 38 | + expect(out).to include("Using foo 1.0 from #{lib_path("foo")} (at #{revision_for(lib_path("foo"))[0..6]})") |
39 | 39 | expect(the_bundle).to include_gems "foo 1.0", source: "git@#{lib_path("foo")}" |
40 | 40 | end |
41 | 41 |
|
|
193 | 193 | gem "foo", :git => "#{lib_path("foo")}" |
194 | 194 | G |
195 | 195 |
|
196 | | - expect(out).to include("Using foo 1.0 from #{lib_path("foo")} (at main@#{rev[0..6]})") |
| 196 | + expect(out).to include("Using foo 1.0 from #{lib_path("foo")} (at #{rev[0..6]})") |
197 | 197 | expect(the_bundle).to include_gems "foo 1.0", source: "git@#{lib_path("foo")}" |
198 | 198 |
|
199 | 199 | old_lockfile = lockfile |
|
202 | 202 | rev2 = revision_for(lib_path("foo")) |
203 | 203 |
|
204 | 204 | bundle :update, all: true, verbose: true |
205 | | - expect(out).to include("Using foo 2.0 (was 1.0) from #{lib_path("foo")} (at main@#{rev2[0..6]})") |
| 205 | + expect(out).to include("Using foo 2.0 (was 1.0) from #{lib_path("foo")} (at #{rev2[0..6]})") |
206 | 206 | expect(out).to include("Removing foo (#{rev[0..11]})") |
207 | 207 | expect(the_bundle).to include_gems "foo 2.0", source: "git@#{lib_path("foo")}" |
208 | 208 |
|
209 | 209 | lockfile(old_lockfile) |
210 | 210 |
|
211 | 211 | bundle :install, verbose: true |
212 | | - expect(out).to include("Using foo 1.0 from #{lib_path("foo")} (at main@#{rev[0..6]})") |
| 212 | + expect(out).to include("Using foo 1.0 from #{lib_path("foo")} (at #{rev[0..6]})") |
213 | 213 | expect(the_bundle).to include_gems "foo 1.0", source: "git@#{lib_path("foo")}" |
214 | 214 | end |
215 | 215 |
|
216 | 216 | context "when install directory exists" do |
217 | 217 | let(:checkout_confirmation_log_message) { "Checking out revision" } |
218 | | - let(:using_foo_confirmation_log_message) { "Using foo 1.0 from #{lib_path("foo")} (at main@#{revision_for(lib_path("foo"))[0..6]})" } |
| 218 | + let(:using_foo_confirmation_log_message) { "Using foo 1.0 from #{lib_path("foo")} (at #{revision_for(lib_path("foo"))[0..6]})" } |
219 | 219 |
|
220 | 220 | context "and no contents besides .git directory are present" do |
221 | 221 | it "reinstalls gem" do |
|
0 commit comments