]>
Commit | Line | Data |
---|---|---|
c0484a8d ER |
1 | From c9b2eff36728266052ccfff54d3ac0a0624fd0f1 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com> | |
3 | Date: Thu, 14 Feb 2013 11:50:41 +0100 | |
08c2f6e5 | 4 | Subject: [PATCH 1/2] Use File.join insteado of manual path creation. |
c0484a8d ER |
5 | |
6 | This prevents issues, when File.join in #new_default_spec removes | |
7 | superfluous slashes while they are kept in expected paths. E.g. the test | |
8 | would fail if ruby configuration specifies --with-ruby-version=''. | |
9 | --- | |
10 | test/rubygems/test_gem_commands_contents_command.rb | 8 ++++---- | |
11 | 1 file changed, 4 insertions(+), 4 deletions(-) | |
12 | ||
13 | diff --git a/test/rubygems/test_gem_commands_contents_command.rb b/test/rubygems/test_gem_commands_contents_command.rb | |
14 | index 60df53f..35c9631 100644 | |
15 | --- a/test/rubygems/test_gem_commands_contents_command.rb | |
16 | +++ b/test/rubygems/test_gem_commands_contents_command.rb | |
17 | @@ -140,10 +140,10 @@ lib/foo.rb | |
18 | @cmd.execute | |
19 | end | |
20 | ||
21 | - expected = %W[ | |
22 | - #{Gem::ConfigMap[:bindir]}/default_command | |
23 | - #{Gem::ConfigMap[:rubylibdir]}/default/gem.rb | |
24 | - #{Gem::ConfigMap[:archdir]}/default_gem.so | |
25 | + expected = [ | |
26 | + File.join(Gem::ConfigMap[:bindir], 'default_command'), | |
27 | + File.join(Gem::ConfigMap[:rubylibdir], 'default/gem.rb'), | |
28 | + File.join(Gem::ConfigMap[:archdir], 'default_gem.so') | |
29 | ].sort.join "\n" | |
30 | ||
31 | assert_equal expected, @ui.output.chomp | |
32 | -- | |
33 | 1.8.1.2 | |
34 |