diff options
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/functional/run_lock_spec.rb | 9 | ||||
| -rw-r--r-- | spec/integration/recipes/recipe_dsl_spec.rb | 5 | ||||
| -rw-r--r-- | spec/integration/recipes/resource_action_spec.rb | 9 | ||||
| -rw-r--r-- | spec/support/shared/integration/knife_support.rb | 4 | ||||
| -rw-r--r-- | spec/tiny_server.rb | 4 |
5 files changed, 10 insertions, 21 deletions
diff --git a/spec/functional/run_lock_spec.rb b/spec/functional/run_lock_spec.rb index fa450b9c8d..c8d6560be7 100644 --- a/spec/functional/run_lock_spec.rb +++ b/spec/functional/run_lock_spec.rb @@ -326,9 +326,7 @@ describe Chef::RunLock do @read_from_tests, @write_to_process = IO.pipe end - attr_reader :example - attr_reader :name - attr_reader :pid + attr_reader :example, :name, :pid def last_event loop do @@ -428,10 +426,7 @@ describe Chef::RunLock do private - attr_reader :read_from_process - attr_reader :write_to_tests - attr_reader :read_from_tests - attr_reader :write_to_process + attr_reader :read_from_process, :write_to_tests, :read_from_tests, :write_to_process class TestRunLock < Chef::RunLock attr_accessor :client_process diff --git a/spec/integration/recipes/recipe_dsl_spec.rb b/spec/integration/recipes/recipe_dsl_spec.rb index 797e9ecb70..eb2377e25e 100644 --- a/spec/integration/recipes/recipe_dsl_spec.rb +++ b/spec/integration/recipes/recipe_dsl_spec.rb @@ -20,9 +20,8 @@ describe "Recipe DSL methods" do default_action :create class<<self - attr_accessor :created_name - attr_accessor :created_resource - attr_accessor :created_provider + attr_accessor :created_name, :created_resource, :created_provider + end def provider diff --git a/spec/integration/recipes/resource_action_spec.rb b/spec/integration/recipes/resource_action_spec.rb index 9bfe86c74e..e196d9559b 100644 --- a/spec/integration/recipes/resource_action_spec.rb +++ b/spec/integration/recipes/resource_action_spec.rb @@ -177,9 +177,8 @@ module ResourceActionSpec end class <<self - attr_accessor :ran_action - attr_accessor :succeeded - attr_accessor :ruby_block_converged + attr_accessor :ran_action, :succeeded, :ruby_block_converged + end action :access_recipe_dsl do @@ -281,8 +280,8 @@ module ResourceActionSpec @bar end class <<self - attr_accessor :load_current_resource_ran - attr_accessor :jackalope_ran + attr_accessor :load_current_resource_ran, :jackalope_ran + end action :access_jackalope do ActionJackalope.jackalope_ran = :access_jackalope diff --git a/spec/support/shared/integration/knife_support.rb b/spec/support/shared/integration/knife_support.rb index af7b503d16..1b3f1afcab 100644 --- a/spec/support/shared/integration/knife_support.rb +++ b/spec/support/shared/integration/knife_support.rb @@ -128,9 +128,7 @@ module KnifeSupport @exit_code = exit_code end - attr_reader :stdout - attr_reader :stderr - attr_reader :exit_code + attr_reader :stdout, :stderr, :exit_code def should_fail(*args) expected = {} diff --git a/spec/tiny_server.rb b/spec/tiny_server.rb index 868933b042..d1075b781d 100644 --- a/spec/tiny_server.rb +++ b/spec/tiny_server.rb @@ -44,9 +44,7 @@ module TinyServer @creator = caller.first end - attr_reader :options - attr_reader :creator - attr_reader :server + attr_reader :options, :creator, :server def start(timeout = 5) raise "Server already started!" if server |