Wrap long lines

cucumber · Apr 11, 2020 · 3742815 · 3742815
1 parent 75310ab
commit 3742815
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 16 deletions.
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2020-04-11 12:22:18 +0200 using RuboCop version 0.79.0.
+# on 2020-04-11 12:33:09 +0200 using RuboCop version 0.79.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -19,13 +19,6 @@ Layout/EmptyLines:
   Exclude:
     - 'lib/aruba/api/core.rb'
 
-# Offense count: 4
-# Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Layout/LineLength:
-  Max: 256
-
 # Offense count: 7
 Lint/AmbiguousBlockAssociation:
   Exclude:
@@ -51,12 +44,12 @@ Metrics/AbcSize:
 # Configuration parameters: CountComments, ExcludedMethods.
 # ExcludedMethods: refine
 Metrics/BlockLength:
-  Max: 587
+  Max: 593
 
 # Offense count: 2
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 152
+  Max: 153
 
 # Offense count: 5
 Metrics/CyclomaticComplexity:
@@ -197,11 +190,10 @@ Style/IdenticalConditionalBranches:
   Exclude:
     - 'lib/aruba/hooks.rb'
 
-# Offense count: 8
+# Offense count: 7
 # Cop supports --auto-correct.
 Style/IfUnlessModifier:
   Exclude:
-    - 'lib/aruba/api/core.rb'
     - 'lib/aruba/cucumber/command.rb'
     - 'lib/aruba/matchers/collection/include_an_object.rb'
     - 'lib/aruba/platforms/unix_environment_variables.rb'

diff --git a/lib/aruba/api/core.rb b/lib/aruba/api/core.rb
@@ -137,7 +137,9 @@ def expand_path(file_name, dir_string = nil)
 
         fail ArgumentError, message unless file_name.is_a?(String) && !file_name.empty?
 
-        fail %(Aruba's working directory does not exist. Maybe you forgot to run `setup_aruba` before using its API.) unless Aruba.platform.directory? File.join(aruba.config.root_directory, aruba.config.working_directory)
+        unless Aruba.platform.directory? File.join(aruba.config.root_directory, aruba.config.working_directory)
+          fail %(Aruba's working directory does not exist. Maybe you forgot to run `setup_aruba` before using its API.)
+        end
 
 
         prefix = file_name[0]

diff --git a/lib/aruba/event_bus/name_resolver.rb b/lib/aruba/event_bus/name_resolver.rb
@@ -146,7 +146,9 @@ def initialize(default_namespace)
       def transform(event_id)
         resolvers.find { |r| r.match? event_id }.new.transform(default_namespace, event_id)
       rescue => e
-        raise EventNameResolveError, %(Transforming "#{event_id}" into an event class failed. Supported types are: #{@resolvers.map(&:supports).flatten.join(', ')}. #{e.message}.\n\n#{e.backtrace.join("\n")})
+        types = @resolvers.map(&:supports).flatten.join(', ')
+        message = %(Transforming "#{event_id}" into an event class failed. Supported types are: #{types}. #{e.message}.)
+        raise EventNameResolveError, message, cause: e
       end
     end
   end

diff --git a/lib/aruba/processes/spawn_process.rb b/lib/aruba/processes/spawn_process.rb
@@ -65,7 +65,8 @@ def initialize(cmd, exit_timeout, io_wait_timeout, working_directory,
       #
       def start
         if started?
-          error_message = %(Command "#{commandline}" has already been started. Please `#stop` the command first and `#start` it again. Alternatively use `#restart`.\n#{caller.join("\n")})
+          error_message = "Command \"#{commandline}\" has already been started." \
+            ' Please `#stop` the command first and `#start` it again. Alternatively use `#restart`.'
           fail CommandAlreadyStartedError, error_message
         end
 

diff --git a/spec/aruba/api/filesystem_spec.rb b/spec/aruba/api/filesystem_spec.rb
@@ -407,7 +407,13 @@
 
             before(:each) { create_test_files(source) }
 
-            it { expect { @aruba.copy source, destination }.to raise_error ArgumentError, %(same file: #{File.expand_path(File.join(@aruba.aruba.current_directory, source))} and #{File.expand_path(File.join(@aruba.aruba.current_directory, destination))}) }
+            it 'raises an appropriate error' do
+              src_path = File.expand_path(File.join(@aruba.aruba.current_directory, source))
+              dest_path = File.expand_path(File.join(@aruba.aruba.current_directory, destination))
+              expected_message = %(same file: #{src_path} and #{dest_path})
+              expect { @aruba.copy source, destination }
+                .to raise_error ArgumentError, expected_message
+            end
           end
 
           context 'when a fixture is destination' do