From 52dcfcedd304c90a583daf03d0d5c821a0e65a90 Mon Sep 17 00:00:00 2001 From: Thibault Jouan Date: Sat, 27 Sep 2014 12:20:24 +0000 Subject: [PATCH] Refactor specs --- spec/producer/core/actions/echo_spec.rb | 2 +- spec/producer/core/actions/file_append_spec.rb | 2 +- spec/producer/core/actions/file_replace_content_spec.rb | 2 +- spec/producer/core/actions/file_writer_spec.rb | 6 +++--- spec/producer/core/actions/mkdir_spec.rb | 4 ++-- spec/producer/core/actions/shell_command_spec.rb | 2 +- spec/producer/core/condition_spec.rb | 2 +- spec/producer/core/prompter_spec.rb | 2 +- spec/producer/core/remote/fs_spec.rb | 2 +- spec/producer/core/remote_spec.rb | 2 +- spec/producer/core/testing/mock_remote_spec.rb | 2 +- spec/producer/core/tests/file_contains_spec.rb | 2 +- spec/producer/core/tests/file_eq_spec.rb | 2 +- spec/producer/core/tests/has_dir_spec.rb | 2 +- spec/producer/core/tests/has_env_spec.rb | 4 ++-- spec/producer/core/tests/has_executable_spec.rb | 2 +- spec/producer/core/tests/has_file_spec.rb | 2 +- 17 files changed, 21 insertions(+), 21 deletions(-) diff --git a/spec/producer/core/actions/echo_spec.rb b/spec/producer/core/actions/echo_spec.rb index 48ddfff..4d3d90c 100644 --- a/spec/producer/core/actions/echo_spec.rb +++ b/spec/producer/core/actions/echo_spec.rb @@ -4,7 +4,7 @@ module Producer::Core module Actions describe Echo, :env do let(:text) { 'hello' } - subject(:echo) { Echo.new(env, text) } + subject(:echo) { described_class.new(env, text) } it_behaves_like 'action' diff --git a/spec/producer/core/actions/file_append_spec.rb b/spec/producer/core/actions/file_append_spec.rb index 2185795..ed00d2f 100644 --- a/spec/producer/core/actions/file_append_spec.rb +++ b/spec/producer/core/actions/file_append_spec.rb @@ -6,7 +6,7 @@ module Producer::Core let(:path) { 'some_path' } let(:content) { 'some content' } let(:added_content) { ' added' } - subject(:action) { FileAppend.new(env, path, added_content) } + subject(:action) { described_class.new(env, path, added_content) } it_behaves_like 'action' diff --git a/spec/producer/core/actions/file_replace_content_spec.rb b/spec/producer/core/actions/file_replace_content_spec.rb index 9cd5757..a478ec9 100644 --- a/spec/producer/core/actions/file_replace_content_spec.rb +++ b/spec/producer/core/actions/file_replace_content_spec.rb @@ -7,7 +7,7 @@ module Producer::Core let(:pattern) { 'content' } let(:replacement) { 'other content' } let(:content) { 'some content' } - subject(:action) { FileReplaceContent.new(env, path, pattern, replacement) } + subject(:action) { described_class.new(env, path, pattern, replacement) } it_behaves_like 'action' diff --git a/spec/producer/core/actions/file_writer_spec.rb b/spec/producer/core/actions/file_writer_spec.rb index 0614c42..a7a798b 100644 --- a/spec/producer/core/actions/file_writer_spec.rb +++ b/spec/producer/core/actions/file_writer_spec.rb @@ -5,7 +5,7 @@ module Producer::Core describe FileWriter, :env do let(:path) { 'some_path' } let(:content) { 'some_content' } - subject(:writer) { FileWriter.new(env, path, content) } + subject(:writer) { described_class.new(env, path, content) } it_behaves_like 'action' @@ -16,7 +16,7 @@ module Producer::Core end context 'when a mode was given' do - subject(:writer) { FileWriter.new(env, path, content, 0600) } + subject(:writer) { described_class.new(env, path, content, 0600) } it 'specifies the given mode' do expect(remote_fs) @@ -44,7 +44,7 @@ module Producer::Core end context 'when a mode was given' do - subject(:writer) { FileWriter.new(env, path, content, 0600) } + subject(:writer) { described_class.new(env, path, content, 0600) } it 'returns the mode' do expect(writer.mode).to eq 0600 diff --git a/spec/producer/core/actions/mkdir_spec.rb b/spec/producer/core/actions/mkdir_spec.rb index 44dfc94..52b4c1f 100644 --- a/spec/producer/core/actions/mkdir_spec.rb +++ b/spec/producer/core/actions/mkdir_spec.rb @@ -4,7 +4,7 @@ module Producer::Core module Actions describe Mkdir, :env do let(:path) { 'some_path' } - subject(:mkdir) { Mkdir.new(env, path) } + subject(:mkdir) { described_class.new(env, path) } it_behaves_like 'action' @@ -17,7 +17,7 @@ module Producer::Core end context 'when a mode was given' do - subject(:mkdir) { Mkdir.new(env, path, 0700) } + subject(:mkdir) { described_class.new(env, path, 0700) } it 'changes the directory with given mode' do expect(remote_fs).to receive(:chmod).with(path, 0700) diff --git a/spec/producer/core/actions/shell_command_spec.rb b/spec/producer/core/actions/shell_command_spec.rb index 933bd2e..fa7d6c4 100644 --- a/spec/producer/core/actions/shell_command_spec.rb +++ b/spec/producer/core/actions/shell_command_spec.rb @@ -5,7 +5,7 @@ module Producer::Core describe ShellCommand, :env do let(:command_args) { 'hello from remote host' } let(:command) { "echo #{command_args}" } - subject(:sh) { ShellCommand.new(env, command) } + subject(:sh) { described_class.new(env, command) } it_behaves_like 'action' diff --git a/spec/producer/core/condition_spec.rb b/spec/producer/core/condition_spec.rb index 99fae3b..82ed2c2 100644 --- a/spec/producer/core/condition_spec.rb +++ b/spec/producer/core/condition_spec.rb @@ -88,7 +88,7 @@ module Producer::Core before { described_class.define_test(:some_test, some_test) } it 'returns an evaluated condition' do - expect(condition).to be_a Condition + expect(condition).to be_a described_class end it 'evaluates the condition tests' do diff --git a/spec/producer/core/prompter_spec.rb b/spec/producer/core/prompter_spec.rb index cb5e83b..b6e0551 100644 --- a/spec/producer/core/prompter_spec.rb +++ b/spec/producer/core/prompter_spec.rb @@ -4,7 +4,7 @@ module Producer::Core describe Prompter do let(:input) { StringIO.new } let(:output) { StringIO.new } - subject(:prompter) { Prompter.new(input, output) } + subject(:prompter) { described_class.new(input, output) } describe '#initialize' do it 'assigns the given input' do diff --git a/spec/producer/core/remote/fs_spec.rb b/spec/producer/core/remote/fs_spec.rb index 911644c..22bb1f6 100644 --- a/spec/producer/core/remote/fs_spec.rb +++ b/spec/producer/core/remote/fs_spec.rb @@ -5,7 +5,7 @@ module Producer::Core describe FS do let(:sftp_file) { double 'sftp_file' } let(:sftp) { double('sftp', file: sftp_file) } - subject(:fs) { FS.new(sftp) } + subject(:fs) { described_class.new(sftp) } describe '#initialize' do it 'assigns the sftp session' do diff --git a/spec/producer/core/remote_spec.rb b/spec/producer/core/remote_spec.rb index 674c833..b6cb21b 100644 --- a/spec/producer/core/remote_spec.rb +++ b/spec/producer/core/remote_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' module Producer::Core describe Remote do let(:hostname) { 'some_host.example' } - subject(:remote) { Remote.new(hostname) } + subject(:remote) { described_class.new(hostname) } describe '#initialize' do it 'assigns the given hostname' do diff --git a/spec/producer/core/testing/mock_remote_spec.rb b/spec/producer/core/testing/mock_remote_spec.rb index 729486d..7489fde 100644 --- a/spec/producer/core/testing/mock_remote_spec.rb +++ b/spec/producer/core/testing/mock_remote_spec.rb @@ -4,7 +4,7 @@ require 'producer/core/testing' module Producer::Core module Testing describe MockRemote do - subject(:remote) { MockRemote.new('some_host.example') } + subject(:remote) { described_class.new('some_host.example') } it 'is a remote' do expect(remote).to be_a Remote diff --git a/spec/producer/core/tests/file_contains_spec.rb b/spec/producer/core/tests/file_contains_spec.rb index 5364a47..b969ef1 100644 --- a/spec/producer/core/tests/file_contains_spec.rb +++ b/spec/producer/core/tests/file_contains_spec.rb @@ -5,7 +5,7 @@ module Producer::Core describe FileContains, :env do let(:filepath) { 'some_file' } let(:content) { 'some_content' } - subject(:test) { FileContains.new(env, filepath, content) } + subject(:test) { described_class.new(env, filepath, content) } it_behaves_like 'test' diff --git a/spec/producer/core/tests/file_eq_spec.rb b/spec/producer/core/tests/file_eq_spec.rb index f96e428..d25a723 100644 --- a/spec/producer/core/tests/file_eq_spec.rb +++ b/spec/producer/core/tests/file_eq_spec.rb @@ -5,7 +5,7 @@ module Producer::Core describe FileEq, :env do let(:filepath) { 'some_file' } let(:content) { 'some content' } - subject(:test) { FileEq.new(env, filepath, content) } + subject(:test) { described_class.new(env, filepath, content) } it_behaves_like 'test' diff --git a/spec/producer/core/tests/has_dir_spec.rb b/spec/producer/core/tests/has_dir_spec.rb index 39ebfc1..b72a268 100644 --- a/spec/producer/core/tests/has_dir_spec.rb +++ b/spec/producer/core/tests/has_dir_spec.rb @@ -4,7 +4,7 @@ module Producer::Core module Tests describe HasDir, :env do let(:path) { 'some_directory' } - subject(:has_dir) { HasDir.new(env, path) } + subject(:has_dir) { described_class.new(env, path) } it_behaves_like 'test' diff --git a/spec/producer/core/tests/has_env_spec.rb b/spec/producer/core/tests/has_env_spec.rb index af5a980..1157474 100644 --- a/spec/producer/core/tests/has_env_spec.rb +++ b/spec/producer/core/tests/has_env_spec.rb @@ -7,7 +7,7 @@ module Producer::Core let(:var_name) { 'SOME_VAR' } let(:var_value) { 'SOME_VALUE' } let(:remote_env) { { 'SOME_VAR' => 'SOME_VALUE' } } - subject(:has_env) { HasEnv.new(env, var_name) } + subject(:has_env) { described_class.new(env, var_name) } it_behaves_like 'test' @@ -42,7 +42,7 @@ module Producer::Core end context 'when var name and value are provided' do - subject(:has_env) { HasEnv.new(env, var_name, var_value) } + subject(:has_env) { described_class.new(env, var_name, var_value) } describe '#verify' do context 'when remote environment var is defined' do diff --git a/spec/producer/core/tests/has_executable_spec.rb b/spec/producer/core/tests/has_executable_spec.rb index 0a40ad1..10eed45 100644 --- a/spec/producer/core/tests/has_executable_spec.rb +++ b/spec/producer/core/tests/has_executable_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' module Producer::Core module Tests describe HasExecutable, :env do - subject(:test) { HasExecutable.new(env, executable) } + subject(:test) { described_class.new(env, executable) } it_behaves_like 'test' diff --git a/spec/producer/core/tests/has_file_spec.rb b/spec/producer/core/tests/has_file_spec.rb index b7a584e..178913f 100644 --- a/spec/producer/core/tests/has_file_spec.rb +++ b/spec/producer/core/tests/has_file_spec.rb @@ -4,7 +4,7 @@ module Producer::Core module Tests describe HasFile, :env do let(:filepath) { 'some_file' } - subject(:has_file) { HasFile.new(env, filepath) } + subject(:has_file) { described_class.new(env, filepath) } it_behaves_like 'test'