tailor 1.4.0 → 1.4.1

data/spec/unit/tailor/cli/options_spec.rb

@@ -1,10 +1,12 @@
 require 'spec_helper'
 require 'tailor/cli/options'
 
+# Module to use in tests.
 module OptionHelpers
   def cli_option(name)
     "--#{name.to_s.gsub('_', '-')}"
   end
+
   def option_value(name, value)
     options = Tailor::CLI::Options.parse!([cli_option(name), value])
     options.style[name]
@@ -13,6 +15,7 @@ end
 
 describe Tailor::CLI::Options do
   include OptionHelpers
+
   describe '#parse!' do
     [
       :indentation_spaces,
@@ -31,20 +34,23 @@ describe Tailor::CLI::Options do
       :spaces_in_empty_braces,
       :trailing_newlines
     ].each do |o|
-        it 'parses a valid numeric argument correct' do
-          expect(option_value(o, '1')).to eq 1
-        end
-        it 'marks the ruler as off if the option is specified as "off"' do
-          expect(option_value(o, 'off')).to eq :off
-        end
-        it 'marks a ruler as off if the option is specified as "false"' do
-          expect(option_value(o, 'false')).to eq :off
-        end
-        it 'raises if the argument is otherwise not an integer' do
-          expect do
-            option_value(o, 'not-an-integer')
-          end.to raise_error(OptionParser::InvalidArgument)
-        end
+      it 'parses a valid numeric argument correct' do
+        expect(option_value(o, '1')).to eq 1
+      end
+
+      it 'marks the ruler as off if the option is specified as "off"' do
+        expect(option_value(o, 'off')).to eq :off
+      end
+
+      it 'marks a ruler as off if the option is specified as "false"' do
+        expect(option_value(o, 'false')).to eq :off
+      end
+
+      it 'raises if the argument is otherwise not an integer' do
+        expect do
+          option_value(o, 'not-an-integer')
+        end.to raise_error(OptionParser::InvalidArgument)
       end
+    end
   end
 end

data/spec/unit/tailor/cli_spec.rb

@@ -1,24 +1,18 @@
 require 'spec_helper'
 require 'tailor/cli'
 
-
 describe Tailor::CLI do
   let(:args) { [] }
   let(:options) { double 'Options', show_config: false }
 
   let(:config) do
-    double 'Tailor::Configuration',
-      file_sets: nil, formatters: nil, load!: nil
+    double 'Tailor::Configuration', file_sets: nil, formatters: nil, load!: nil
   end
 
   before do
-    Tailor::Configuration.stub(:new).and_return config
-    Tailor::Critic.stub(:new)
-    Tailor::Reporter.stub(:new)
-  end
-
-  after do
-    Tailor::Configuration.unstub(:new)
+    allow(Tailor::Configuration).to receive(:new).and_return config
+    allow(Tailor::Critic).to receive(:new)
+    allow(Tailor::Reporter).to receive(:new)
   end
 
   subject { Tailor::CLI.new(args) }
@@ -26,39 +20,40 @@ describe Tailor::CLI do
   describe '::run' do
     it "creates an instance of Tailor::CLI and calls that object's #execute!" do
       cli = double 'Tailor::CLI'
-      cli.should_receive(:execute!)
-      Tailor::CLI.should_receive(:new).and_return cli
+      expect(cli).to receive(:execute!)
+      expect(Tailor::CLI).to receive(:new).and_return cli
       Tailor::CLI.run([])
     end
   end
 
   describe '#initialize' do
-    let(:args) { %w[last] }
+    let(:args) { %w(last) }
 
     it 'uses Options to parse the args' do
-      Tailor::Configuration.stub(:new).and_return config
-      Tailor::Critic.stub(:new)
-      Tailor::Reporter.stub(:new)
-      Tailor::CLI::Options.should_receive(:parse!).with(args).and_return options
+      allow(Tailor::Configuration).to receive(:new).and_return config
+      allow(Tailor::Critic).to receive(:new)
+      allow(Tailor::Reporter).to receive(:new)
+      expect(Tailor::CLI::Options).to receive(:parse!).
+        with(args).and_return options
 
       Tailor::CLI.new(args)
     end
 
     it 'creates a new Configuration from the file/dir and options' do
-      Tailor::CLI::Options.stub(:parse!).and_return(options)
-      Tailor::Configuration.should_receive(:new).
-        with(args, options).and_return config
+      allow(Tailor::CLI::Options).to receive(:parse!).and_return(options)
+      expect(Tailor::Configuration).to receive(:new).with(args, options).
+        and_return config
       Tailor::Critic.stub(:new)
 
       Tailor::CLI.new(args)
     end
 
     context 'options.show_config is true' do
-
+      pending
     end
 
     context 'options.show_config is false' do
-
+      pending
     end
   end
 
@@ -67,26 +62,21 @@ describe Tailor::CLI do
     let(:critic) { double 'Tailor::Critic', problem_count: 0 }
 
     before do
-      Tailor::Critic.stub(:new).and_return(critic)
-      Tailor::Reporter.stub(:new).and_return(reporter)
+      allow(Tailor::Critic).to receive(:new).and_return(critic)
+      allow(Tailor::Reporter).to receive(:new).and_return(reporter)
       subject.instance_variable_set(:@critic, critic)
       subject.instance_variable_set(:@reporter, reporter)
     end
 
-    after do
-      Tailor::Critic.unstub(:new)
-      Tailor::Reporter.unstub(:new)
-    end
-
     it 'calls @critic.critique and yields file problems and the label' do
       problems_for_file = {}
       label = :test
-      config.should_receive(:output_file)
-      critic.stub(:problem_count).and_return 1
-      critic.stub(:problems)
-      critic.stub(:critique).and_yield(problems_for_file, label)
-      reporter.stub(:summary_report)
-      reporter.should_receive(:file_report).with(problems_for_file, label)
+      expect(config).to receive(:output_file)
+      allow(critic).to receive(:problem_count).and_return 1
+      allow(critic).to receive(:problems)
+      allow(critic).to receive(:critique).and_yield(problems_for_file, label)
+      allow(reporter).to receive(:summary_report)
+      expect(reporter).to receive(:file_report).with(problems_for_file, label)
 
       subject.execute!
     end
@@ -96,20 +86,16 @@ describe Tailor::CLI do
     let(:critic) { double 'Tailor::Critic', problem_count: 0 }
 
     before do
-      Tailor::Critic.stub(:new).and_return(critic)
+      allow(Tailor::Critic).to receive(:new).and_return(critic)
       subject.instance_variable_set(:@critic, critic)
     end
 
-    after do
-      Tailor::Critic.unstub(:new)
-    end
-
     it 'calls @critic.critique and return @critique.problems hash' do
       problems = {}
-      critic.should_receive(:critique)
-      critic.should_receive(:problems).and_return(problems)
+      expect(critic).to receive(:critique)
+      expect(critic).to receive(:problems).and_return(problems)
 
-      subject.result.should == problems
+      expect(subject.result).to eq problems
     end
   end
 end

data/spec/unit/tailor/composite_observable_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'tailor/composite_observable'
 
-
+# Class to use for tests.
 class Tester
   include Tailor::CompositeObservable
 end

data/spec/unit/tailor/configuration/file_set_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 require 'tailor/configuration/file_set'
 
-
 describe Tailor::Configuration::FileSet do
   describe '#build_file_list' do
     context 'param is a file name' do
@@ -12,14 +11,14 @@ describe Tailor::Configuration::FileSet do
 
         it 'builds an Array with that file\'s expanded path' do
           new_list = subject.instance_eval { build_file_list('./test.rb') }
-          new_list.should be_an Array
-          new_list.first.should match %r[/test.rb$]
+          expect(new_list).to be_an Array
+          expect(new_list.first).to match(%r{/test.rb$})
         end
       end
 
       context 'the file does not exist' do
         it 'returns an empty Array' do
-          subject.instance_eval { build_file_list('test.rb') }.should == []
+          expect(subject.instance_eval { build_file_list('test.rb') }).to eq []
         end
       end
     end
@@ -30,8 +29,8 @@ describe Tailor::Configuration::FileSet do
       end
 
       it 'returns the Array with expanded file paths' do
-        subject.instance_eval { build_file_list(['test.rb']) }.
-          first.should match %r[/test.rb$]
+        expect(subject.instance_eval { build_file_list(['test.rb']) }.first).
+          to match(%r{/test.rb$})
       end
     end
 
@@ -43,8 +42,8 @@ describe Tailor::Configuration::FileSet do
 
       it 'returns the expanded file paths in that directory' do
         list = subject.instance_eval { build_file_list('test') }
-        list.size.should be 1
-        list.first.should match /.+\/test.rb/
+        expect(list.size).to eq 1
+        expect(list.first).to match(/.+\/test.rb/)
       end
     end
   end
@@ -57,9 +56,9 @@ describe Tailor::Configuration::FileSet do
 
     it 'builds the file list and concats that to @file_list' do
       subject.update_file_list('test2.rb')
-      subject.instance_variable_get(:@file_list).size.should be 2
-      subject.instance_variable_get(:@file_list).last.
-        should match %r[/test2.rb]
+      expect(subject.instance_variable_get(:@file_list).size).to eq 2
+      expect(subject.instance_variable_get(:@file_list).last).
+        to match(%r{/test2.rb})
     end
   end
 end

data/spec/unit/tailor/configuration/style_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 require 'tailor/configuration/style'
 
-
 describe Tailor::Configuration::Style do
   describe '.define_property' do
     it 'defines an instance method that takes 2 params' do
@@ -12,7 +11,7 @@ describe Tailor::Configuration::Style do
     it 'allows access to the values via #to_hash' do
       Tailor::Configuration::Style.define_property(:test_method)
       subject.test_method(1, level: :pants)
-      subject.to_hash.should include test_method: [1, { level: :pants }]
+      expect(subject.to_hash).to include test_method: [1, { level: :pants }]
     end
   end
 
@@ -20,134 +19,134 @@ describe Tailor::Configuration::Style do
     describe 'sets up default values' do
       describe 'allow_camel_case_methods' do
         specify do
-          subject.instance_variable_get(:@allow_camel_case_methods).should == [
-            false, { level: :error }]
+          expect(subject.instance_variable_get(:@allow_camel_case_methods)).
+            to eq [false, { level: :error }]
         end
       end
 
       describe 'allow_hard_tabs' do
         specify do
-          subject.instance_variable_get(:@allow_hard_tabs).should == [
-            false, { level: :error }]
+          expect(subject.instance_variable_get(:@allow_hard_tabs)).
+            to eq [false, { level: :error }]
         end
       end
 
       describe 'allow_screaming_snake_case_classes' do
         specify do
-          subject.instance_variable_get(:@allow_screaming_snake_case_classes).
-            should == [false, { level: :error }]
+          expect(subject.instance_variable_get(:@allow_screaming_snake_case_classes)).
+            to eq [false, { level: :error }]
         end
       end
 
       describe 'allow_trailing_line_spaces' do
         specify do
-          subject.instance_variable_get(:@allow_trailing_line_spaces).
-            should == [false, { level: :error }]
+          expect(subject.instance_variable_get(:@allow_trailing_line_spaces)).
+            to eq [false, { level: :error }]
         end
       end
 
       describe 'indentation_spaces' do
         specify do
-          subject.instance_variable_get(:@indentation_spaces).should == [
-            2, { level: :error }]
+          expect(subject.instance_variable_get(:@indentation_spaces)).
+            to eq [2, { level: :error }]
         end
       end
 
       describe 'max_code_lines_in_class' do
         specify do
-          subject.instance_variable_get(:@max_code_lines_in_class).should == [
-            300, { level: :error }]
+          expect(subject.instance_variable_get(:@max_code_lines_in_class)).
+            to eq [300, { level: :error }]
         end
       end
 
       describe 'max_code_lines_in_method' do
         specify do
-          subject.instance_variable_get(:@max_code_lines_in_method).should == [
-            30, { level: :error }]
+          expect(subject.instance_variable_get(:@max_code_lines_in_method)).
+            to eq [30, { level: :error }]
         end
       end
 
       describe 'max_line_length' do
         specify do
-          subject.instance_variable_get(:@max_line_length).should == [
-            80, { level: :error }]
+          expect(subject.instance_variable_get(:@max_line_length)).
+            to eq [80, { level: :error }]
         end
       end
 
       describe 'spaces_after_comma' do
         specify do
-          subject.instance_variable_get(:@spaces_after_comma).should == [
-            1, { level: :error }]
+          expect(subject.instance_variable_get(:@spaces_after_comma)).
+            to eq [1, { level: :error }]
         end
       end
 
       describe 'spaces_after_lbrace' do
         specify do
-          subject.instance_variable_get(:@spaces_after_lbrace).should == [
-            1, { level: :error }]
+          expect(subject.instance_variable_get(:@spaces_after_lbrace)).
+            to eq [1, { level: :error }]
         end
       end
 
       describe 'spaces_after_lbracket' do
         specify do
-          subject.instance_variable_get(:@spaces_after_lbracket).should == [
-            0, { level: :error }]
+          expect(subject.instance_variable_get(:@spaces_after_lbracket)).
+            to eq [0, { level: :error }]
         end
       end
 
       describe 'spaces_after_lparen' do
         specify do
-          subject.instance_variable_get(:@spaces_after_lparen).should == [
-            0, { level: :error }]
+          expect(subject.instance_variable_get(:@spaces_after_lparen)).
+            to eq [0, { level: :error }]
         end
       end
 
       describe 'spaces_before_comma' do
         specify do
-          subject.instance_variable_get(:@spaces_before_comma).should == [
-            0, { level: :error }]
+          expect(subject.instance_variable_get(:@spaces_before_comma)).
+            to eq [0, { level: :error }]
         end
       end
 
       describe 'spaces_before_lbrace' do
         specify do
-          subject.instance_variable_get(:@spaces_before_lbrace).should == [
-            1, { level: :error }]
+          expect(subject.instance_variable_get(:@spaces_before_lbrace)).
+            to eq [1, { level: :error }]
         end
       end
 
       describe 'spaces_before_rbrace' do
         specify do
-          subject.instance_variable_get(:@spaces_before_rbrace).should == [
-            1, { level: :error }]
+          expect(subject.instance_variable_get(:@spaces_before_rbrace)).
+            to eq [1, { level: :error }]
         end
       end
 
       describe 'spaces_before_rbracket' do
         specify do
-          subject.instance_variable_get(:@spaces_before_rbracket).should == [
-            0, { level: :error }]
+          expect(subject.instance_variable_get(:@spaces_before_rbracket)).
+            to eq [0, { level: :error }]
         end
       end
 
       describe 'spaces_before_rparen' do
         specify do
-          subject.instance_variable_get(:@spaces_before_rparen).should == [
-            0, { level: :error }]
+          expect(subject.instance_variable_get(:@spaces_before_rparen)).
+            to eq [0, { level: :error }]
         end
       end
 
       describe 'spaces_in_empty_braces' do
         specify do
-          subject.instance_variable_get(:@spaces_in_empty_braces).should == [
-            0, { level: :error }]
+          expect(subject.instance_variable_get(:@spaces_in_empty_braces)).
+            to eq [0, { level: :error }]
         end
       end
 
       describe 'trailing_newlines' do
         specify do
-          subject.instance_variable_get(:@trailing_newlines).should == [
-            1, { level: :error }]
+          expect(subject.instance_variable_get(:@trailing_newlines)).
+            to eq [1, { level: :error }]
         end
       end
     end
@@ -184,7 +183,7 @@ describe Tailor::Configuration::Style do
     end
 
     it 'returns a Hash of all of the attributes and values' do
-      subject.to_hash.should == default_values
+      expect(subject.to_hash).to eq default_values
     end
 
     context 'with a user-added property' do
@@ -194,7 +193,7 @@ describe Tailor::Configuration::Style do
       end
 
       it 'includes the new property as part of the Hash' do
-        subject.to_hash.should include long_pants: [1, { level: :warn }]
+        expect(subject.to_hash).to include long_pants: [1, { level: :warn }]
       end
     end
   end