upgrading to rspec 3.0

Author: haf

Rakefile

@@ -1,10 +1,10 @@
 require 'bundler/setup'
-require 'rubygems/tasks'
-Gem::Tasks.new
-
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec) do |c|
-  c.rspec_opts = ['--color', '--format=doc']
-end
-
-task :default => :build
+require 'rubygems/tasks'
+Gem::Tasks.new
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |c|
+  c.rspec_opts = ['--color', '--format=doc']
+end
+
+task :default => :build

spec/albacore_spec.rb

@@ -7,14 +7,14 @@
       @got_it = obj
     end
     Albacore.publish :pubsub, true
-    @got_it.should be_true
+    expect(@got_it).to be true
   end
 
   it 'knows if it\'s Windows it\'s running on' do
-    (::Albacore.windows? === true || ::Albacore::windows? === false).should be_true
+    expect(::Albacore.windows? === true || ::Albacore::windows? === false).to be true
   end
   it 'should not be nil' do
-    ::Albacore.windows?.should_not be_nil
+    expect(::Albacore.windows?).to_not be nil
   end
 end
 

spec/build_spec.rb

@@ -8,12 +8,12 @@
     Albacore::Build::Config.new
   end
   %w[file= sln= target target= logging logging= prop cores cores= tools_version tools_version=].each do |writer|
-    it "should have property :#{writer}" do
-      subject.respond_to?(:"#{writer}").should be_true
+    it "should respond to :#{writer}" do
+      expect(subject).to respond_to(:"#{writer}")
     end
   end
   it 'should not have any property' do
-    subject.respond_to?(:something_nonexistent).should be_false
+    expect(subject).to_not respond_to(:something_nonexistent)
   end
 
   describe 'when setting properties' do
@@ -22,8 +22,8 @@
       subject.tools_version = '3.5'
     end
     it do
-      subject.parameters.should include('/verbosity:minimal')
-      subject.parameters.should include('/toolsversion:3.5')
+      expect(subject.parameters).to include('/verbosity:minimal')
+      expect(subject.parameters).to include('/toolsversion:3.5')
     end
   end
 end
@@ -51,13 +51,13 @@
   end
 
   it do
-    subject.executable.should eq('xbuild')
+    expect(subject.executable).to eq('xbuild')
   end
   it do
-    subject.parameters.should eq(%W|/verbosity:minimal #{path 'src/HelloWorld.sln'} /target:Clean;Build|)
+    expect(subject.parameters).to eq(%W|/verbosity:minimal #{path 'src/HelloWorld.sln'} /target:Clean;Build|)
   end
   it do
-    subject.is_mono_command?.should be_false
+    expect(subject.is_mono_command?).to be false
   end
 end
 

spec/dsl_spec.rb

@@ -1,3 +1,4 @@
+require 'albacore/dsl'
 require 'spec_helper'
 
 describe "what methods are included by default" do
@@ -9,7 +10,6 @@ class A ; include Albacore::DSL ; end
 
 class X
   include Albacore::DSL
-  def initialize ; end
 end
 
 #puts "X has methods: #{X.new.private_methods.inspect}"
@@ -21,7 +21,7 @@ def initialize ; end
       X.new
     end
     it do
-      subject.respond_to?(method, true).should be_true
+      expect(subject.method(method)).to_not be nil
     end
   end
 end
@@ -34,6 +34,6 @@ def initialize ; end
     end
   end
   it 'should be named "build"' do
-    subject.name.should eq('build')
+    expect(subject.name).to eq('build')
   end
 end

spec/fpm_app_spec_spec.rb

@@ -54,51 +54,51 @@
   end
 
   it 'should generate command source' do
-    flags['-s'].should eq 'dir'
+    expect(flags['-s']).to eq 'dir'
   end
 
   it 'should generate command target' do
-    flags['-t'].should eq 'rpm'
+    expect(flags['-t']).to eq 'rpm'
   end
 
   it 'should generate command name/title' do
-    flags['--name'].should eq 'my.app'
+    expect(flags['--name']).to eq 'my.app'
   end
 
   it 'should generate command description' do
-    flags['--description'].should eq 'my.app implements much wow'
+    expect(flags['--description']).to eq 'my.app implements much wow'
   end
 
   it 'should generate command url' do
-    flags['--url'].should eq 'https://github.com/Albacore/albacore'
+    expect(flags['--url']).to eq 'https://github.com/Albacore/albacore'
   end
 
   it 'should generate command category' do
-    flags['--category'].should eq 'webserver'
+    expect(flags['--category']).to eq 'webserver'
   end
 
   it 'should generate command version' do
-    flags['--version'].should eq '5.6.7'
+    expect(flags['--version']).to eq '5.6.7'
   end
 
   it 'should generate command epoch' do
-    flags['--epoch'].should eq 1
+    expect(flags['--epoch']).to eq 1
   end
 
   it 'should generate command license' do
-    flags['--license'].should eq 'MIT'
+    expect(flags['--license']).to eq 'MIT'
   end
 
   it 'should generate command "look in this directory" flag' do
-    flags['-C'].should eq '/a/b'
+    expect(flags['-C']).to eq '/a/b'
   end
 
   it 'should generate command depends' do
-    flags['--depends'].should eq 'mono'
+    expect(flags['--depends']).to eq 'mono'
   end
 
   it 'should generate command rpm-digest' do
-    flags['--rpm-digest'].should eq 'sha256'
+    expect(flags['--rpm-digest']).to eq 'sha256'
   end
 end
 
@@ -140,18 +140,18 @@
   end
 
   it 'should not have a license' do
-    spec.license.should be_nil
+    expect(spec.license).to be nil
   end
 
   it 'that license should never be a FPM parameter' do
-    subject.generate_flags.has_key?('--license').should be_false
+    expect(subject.generate_flags.has_key?('--license')).to be false
   end
 end
 
 describe ::Albacore::FpmAppSpec::Config do
   %w|files= out= opts no_bundler|.each do |sym|
     it "should respond_to :#{sym}" do
-      should respond_to :"#{sym}"
+      expect(subject).to respond_to :"#{sym}"
     end
   end
 end

spec/nugets_pack_spec.rb

@@ -156,7 +156,7 @@ def self.create id, curr, gen_symbols = true
   include_context 'path testing'
 
   it "accepts .nuspec files" do
-    NuspecTask.accept?('some.nuspec').should be_true
+    expect(NuspecTask.accept?('some.nuspec')).to be true
   end
 
   let (:cmd) do
@@ -174,10 +174,10 @@ def self.create id, curr, gen_symbols = true
   end
 
   it "should run the correct executable" do
-    subject.mono_command.should eq('NuGet.exe')
+    expect(subject.mono_command).to eq 'NuGet.exe'
   end
   it "should give the correct parameters" do
-    subject.mono_parameters.should eq(%W[Pack -OutputDirectory #{path 'spec/testdata/pkg'} ./spec/testdata/example.nuspec])
+    expect(subject.mono_parameters).to eq %W[Pack -OutputDirectory #{path 'spec/testdata/pkg'} ./spec/testdata/example.nuspec]
   end
 end
 

spec/projectlint_spec.rb

@@ -28,43 +28,43 @@ def project_lint_on(name, path, ignores=nil)
 describe "when supplying a csproj file with files added but not present on the filesystem" do
   before(:all) { @f = project_lint_on(:first, File.join( 'added_but_not_on_filesystem', 'aproject.csproj')) }
 
-  it("should fail") { @f.failed.should be_true }
+  it("should fail") { expect(@f.failed).to be true }
 
-  it("should report failure") { @f.failure_message.should include("-") }
+  it("should report failure") { expect(@f.failure_message).to include "-" }
 
-  it("should report file.cs") { @f.failure_message.should include('File.cs') }
+  it("should report file.cs") { expect(@f.failure_message).to include 'File.cs' }
 
-  it("should report Image.txt") { @f.failure_message.should include('Image.txt') }
+  it("should report Image.txt") { expect(@f.failure_message).to include 'Image.txt' }
 
-  it("should report MyHeavy.heavy") { @f.failure_message.should include('MyHeavy.heavy') }
+  it("should report MyHeavy.heavy") { expect(@f.failure_message).to include 'MyHeavy.heavy' }
 
-  it("should report Schema.xsd") { @f.failure_message.should include('Schema.xsd') }
+  it("should report Schema.xsd") { expect(@f.failure_message).to include 'Schema.xsd' }
 
-  it("should report SubFolder/AnotherFile.cs") { @f.failure_message.should include('AnotherFile.cs') }
+  it("should report SubFolder/AnotherFile.cs") { expect(@f.failure_message).to include 'AnotherFile.cs' }
 
-  it("should not report linked files") { @f.failure_message.should_not include('SomeFile.cs') }
+  it("should not report linked files") { expect(@f.failure_message).to_not include 'SomeFile.cs' }
 end
 
 describe "when supplying a correct csproj file with files added and present on the filesystem" do
 
   before(:all) { @f = project_lint_on(:second, File.join( 'correct', 'aproject.csproj')) }
 
   it("should not fail") {
-    @f.failed.should be_false
+    expect(@f.failed).to be false
   }
-  it("no message") { @f.failure_message.should be_nil } 
+  it("no message") { expect(@f.failure_message).to be nil } 
 end
 
 describe "when supplying a csproj file with files not added but present on the filesystem" do
   before(:all) { @f = project_lint_on(:third, File.join( 'on_filesystem_but_not_added', 'aproject.csproj')) }
 
-  it("should fail") { @f.failed.should be_true }
+  it("should fail") { expect(@f.failed).to be true }
 
-  it("should report failure") { @f.failure_message.should include("+") }
+  it("should report failure") { expect(@f.failure_message).to include '+' }
 
-  it("should report file.cs") { @f.failure_message.should include('File.cs') }
+  it("should report file.cs") { expect(@f.failure_message).to include 'File.cs' }
 
-  it("should report Image.txt") { @f.failure_message.should include('Image.txt') }
+  it("should report Image.txt") { expect(@f.failure_message).to include 'Image.txt' }
 end
 
 
@@ -73,5 +73,5 @@ def project_lint_on(name, path, ignores=nil)
     @f = project_lint_on(:fourth, File.join('on_filesystem_but_not_added', 'aproject.csproj'), [/.*\.txt$/, /.*\.cs$/])
   }
 
-  it("should not fail") { @f.failed.should be_false }
-end
+  it("should not fail") { expect(@f.failed).to be false }
+end

spec/shared_contexts.rb

@@ -13,16 +13,16 @@ def self.has_value sym, e
 
   def self.has_dep name, version
     it "has dependency on '#{name}'" do
-      m.dependencies.has_key?(name).should be_true
+      expect(m.dependencies.has_key?(name)).to be true
     end
     it "overrode dependency on '#{name}'" do
-      m.dependencies[name].version.should eq version
+      expect(m.dependencies[name].version).to eq version
     end
   end
 
   def self.has_not_dep name
     it "does not have a dependency on #{name}" do
-      m.dependencies.has_key?(name).should be_false
+      expect(m.dependencies.has_key?(name)).to be false
     end
   end
 
@@ -35,20 +35,20 @@ def self.has_file src, target, exclude = nil
      #    puts "subject.files: #{subject.files}, index of: #{subject.files.find_index { |f| f.src == src }}"
      #    puts "#{f.inspect}"
      #  end
-      file.should_not be_nil 
+      expect(file).to_not be nil
     end
 
     it "has file[#{src}].target == '#{target}'" do
       file = subject.files.find { |f| f.src == src }
-      file.target.should eq target
+      expect(file.target).to eq target
     end 
   end
 
   def self.has_not_file src
     src = norm src
     it "has not file[#{src}]" do
       file = subject.files.find { |f| f.src == src }
-      file.should be_nil
+      expect(file).to be nil
     end
   end
 

spec/spec_helper.rb

@@ -2,6 +2,7 @@
 require 'albacore/albacore_module'
 
 RSpec.configure do |config|
+  config.raise_errors_for_deprecations! if ENV['RAISE_DEPRECATED']
   config.before(:each) do
     @logout = StringIO.new
     @logout = STDOUT if ENV['TEST_DEBUG']