diff options
| author | Stefan Lance <stefan@lances.net> | 2015-07-16 12:08:48 -0500 |
|---|---|---|
| committer | Stefan Lance <stefan@lances.net> | 2015-08-17 20:57:05 -0500 |
| commit | fb2e01beca73e0da4db08d61cefef846b1325682 (patch) | |
| tree | 7d5696bfc073b0619794d86512d4c207708e012e | |
| parent | 9dd8b35da6a371901de18f2aa1d59cb49c4801f8 (diff) | |
| download | bundler-fb2e01beca73e0da4db08d61cefef846b1325682.tar.gz | |
Fix failing specs
Conflicts:
spec/deprecation_spec.rb
| -rw-r--r-- | lib/bundler/templates/gems.rb (renamed from lib/bundler/templates/Gemfile) | 0 | ||||
| -rw-r--r-- | spec/install/deploy_spec.rb | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/lib/bundler/templates/Gemfile b/lib/bundler/templates/gems.rb index 8d5b66ea29..8d5b66ea29 100644 --- a/lib/bundler/templates/Gemfile +++ b/lib/bundler/templates/gems.rb diff --git a/spec/install/deploy_spec.rb b/spec/install/deploy_spec.rb index ada7e52fd9..a2637362aa 100644 --- a/spec/install/deploy_spec.rb +++ b/spec/install/deploy_spec.rb @@ -29,7 +29,7 @@ describe "install with --deployment or --frozen" do bundle "install" Dir.chdir tmp simulate_new_machine - bundle "install --gemfile #{tmp}/bundled_app/Gemfile --deployment" + bundle "install --gemfile #{tmp}/bundled_app/gems.rb --deployment" Dir.chdir bundled_app should_be_installed "rack 1.0" end |