summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Koronen <koronen@kth.se>2015-08-08 16:51:30 +0200
committerVictor Koronen <koronen@kth.se>2015-08-14 12:29:44 +0200
commit1964fb87d73b6efb2331b3628ca0daf5fcb2515d (patch)
treed1eedeacb2653821e1ff19c1361160b813857cce
parentca272b8f02d847ae897b7c1b87d3e3614d400f74 (diff)
downloadbundler-1964fb87d73b6efb2331b3628ca0daf5fcb2515d.tar.gz
Fix Style/MultilineBlockLayout
-rw-r--r--.rubocop_todo.yml5
-rw-r--r--spec/bundler/gem_helper_spec.rb7
-rw-r--r--spec/lock/lockfile_spec.rb6
3 files changed, 8 insertions, 10 deletions
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 240fddb882..9383ef757b 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -237,11 +237,6 @@ Style/ModuleFunction:
Style/MultilineBlockChain:
Enabled: false
-# Offense count: 3
-# Cop supports --auto-correct.
-Style/MultilineBlockLayout:
- Enabled: false
-
# Offense count: 13
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles.
diff --git a/spec/bundler/gem_helper_spec.rb b/spec/bundler/gem_helper_spec.rb
index ff41f04fb3..0dbd1d8e20 100644
--- a/spec/bundler/gem_helper_spec.rb
+++ b/spec/bundler/gem_helper_spec.rb
@@ -103,9 +103,10 @@ describe Bundler::GemHelper do
end
context "defines Rake tasks" do
- let(:task_names) { %w[build install release
- release:guard_clean release:source_control_push
- release:rubygem_push] }
+ let(:task_names) {
+ %w[build install release release:guard_clean
+ release:source_control_push release:rubygem_push]
+ }
context "before installation" do
it "raises an error with appropriate message" do
diff --git a/spec/lock/lockfile_spec.rb b/spec/lock/lockfile_spec.rb
index 5204e86092..bcca03983c 100644
--- a/spec/lock/lockfile_spec.rb
+++ b/spec/lock/lockfile_spec.rb
@@ -1243,7 +1243,8 @@ describe "the lockfile format" do
context "when nothing changes" do
it "preserves Gemfile.lock \\n line endings" do
- expect { ruby <<-RUBY
+ expect {
+ ruby <<-RUBY
require 'rubygems'
require 'bundler'
Bundler.setup
@@ -1256,7 +1257,8 @@ describe "the lockfile format" do
File.open(bundled_app("Gemfile.lock"), "wb") {|f| f.puts(win_lock) }
set_lockfile_mtime_to_known_value
- expect { ruby <<-RUBY
+ expect {
+ ruby <<-RUBY
require 'rubygems'
require 'bundler'
Bundler.setup