Permalink
Browse files

upgraded RSpec to 2.7 in order to code assemblyinfo tests -- those ar…

…e passing but a lof ot other things are failing tests - for example I would need to get a registered version of NCover to successfully test things interacting with that
  • Loading branch information...
haf committed Oct 24, 2011
1 parent 4041833 commit 244437fbe4a17553854510890d8db89aa81884a8
Showing with 76 additions and 75 deletions.
  1. +1 −1 Gemfile
  2. +3 −3 albacore.gemspec
  3. +65 −64 rakefile.rb
  4. +7 −6 spec/assemblyinfo_spec.rb
  5. +0 −1 spec/spec_helper.rb
View
@@ -6,7 +6,7 @@ group :development do
gem 'nokogiri', '~>1.4'
gem 'version_bumper', '~>0.3'
gem 'jeweler', '~>1.6'
- gem 'rspec', '~>2.6'
+ gem 'rspec', '~>2.7'
gem 'jekyll', '~>0.8'
gem 'watchr', '~>0.7'
end
View
@@ -121,15 +121,15 @@ Gem::Specification.new do |s|
s.add_development_dependency(%q<nokogiri>, ["~> 1.4"])
s.add_development_dependency(%q<version_bumper>, ["~> 0.3"])
s.add_development_dependency(%q<jeweler>, ["~> 1.6"])
- s.add_development_dependency(%q<rspec>, ["~> 1.2"])
+ s.add_development_dependency(%q<rspec>, ["~> 2.7"])
s.add_development_dependency(%q<jekyll>, ["~> 0.8"])
s.add_development_dependency(%q<watchr>, ["~> 0.7"])
else
s.add_dependency(%q<rubyzip>, ["~> 0.9"])
s.add_dependency(%q<nokogiri>, ["~> 1.4"])
s.add_dependency(%q<version_bumper>, ["~> 0.3"])
s.add_dependency(%q<jeweler>, ["~> 1.6"])
- s.add_dependency(%q<rspec>, ["~> 1.2"])
+ s.add_dependency(%q<rspec>, ["~> 2.7"])
s.add_dependency(%q<jekyll>, ["~> 0.8"])
s.add_dependency(%q<watchr>, ["~> 0.7"])
end
@@ -138,7 +138,7 @@ Gem::Specification.new do |s|
s.add_dependency(%q<nokogiri>, ["~> 1.4"])
s.add_dependency(%q<version_bumper>, ["~> 0.3"])
s.add_dependency(%q<jeweler>, ["~> 1.6"])
- s.add_dependency(%q<rspec>, ["~> 1.2"])
+ s.add_dependency(%q<rspec>, ["~> 2.7"])
s.add_dependency(%q<jekyll>, ["~> 0.8"])
s.add_dependency(%q<watchr>, ["~> 0.7"])
end
View
@@ -5,130 +5,131 @@
task :default => ['albacore:sample']
namespace :specs do
- require 'spec/rake/spectask'
+ require 'rspec/core/rake_task'
- @spec_opts = '--colour --format specdoc'
+ @rspec_opts = ['--colour --format documentation']
desc "Run all specs for albacore"
- Spec::Rake::SpecTask.new :all do |t|
- t.spec_files = FileList['spec/**/*_spec.rb'].exclude{ |f|
- f if IS_IRONRUBY && (f.include?("zip"))
- }
- t.spec_opts << @spec_opts
+ RSpec::Core::RakeTask.new :all do |t|
+ t.pattern = 'spec/**/*_spec.rb'
+ t.rspec_opts = @rspec_opts
end
+ #].exclude{ |f|
+ # f if IS_IRONRUBY && (f.include?("zip"))
+ #}
desc "CSharp compiler (csc.exe) specs"
- Spec::Rake::SpecTask.new :csc do |t|
- t.spec_files = FileList['spec/csc*_spec.rb']
- t.spec_opts << @spec_opts
+ RSpec::Core::RakeTask.new :csc do |t|
+ t.pattern = 'spec/csc*_spec.rb'
+ t.rspec_opts = @rspec_opts
end
desc "Assembly info functional specs"
- Spec::Rake::SpecTask.new :assemblyinfo do |t|
- t.spec_files = FileList['spec/assemblyinfo*_spec.rb']
- t.spec_opts << @spec_opts
+ RSpec::Core::RakeTask.new :assemblyinfo do |t|
+ t.pattern = 'spec/assemblyinfo*_spec.rb'
+ t.rspec_opts = @rspec_opts
end
desc "MSBuild functional specs"
- Spec::Rake::SpecTask.new :msbuild do |t|
- t.spec_files = FileList['spec/msbuild*_spec.rb']
- t.spec_opts << @spec_opts
+ RSpec::Core::RakeTask.new :msbuild do |t|
+ t.pattern = 'spec/msbuild*_spec.rb'
+ t.rspec_opts = @rspec_opts
end
desc "SQLServer SQLCmd functional specs"
- Spec::Rake::SpecTask.new :sqlcmd do |t|
- t.spec_files = FileList['spec/sqlcmd*_spec.rb']
- t.spec_opts << @spec_opts
+ RSpec::Core::RakeTask.new :sqlcmd do |t|
+ t.pattern = 'spec/sqlcmd*_spec.rb'
+ t.rspec_opts = @rspec_opts
end
desc "Nant functional specs"
- Spec::Rake::SpecTask.new :nant do |t|
- t.spec_files = FileList['spec/nant*_spec.rb']
- t.spec_opts << @spec_opts
+ RSpec::Core::RakeTask.new :nant do |t|
+ t.pattern = 'spec/nant*_spec.rb'
+ t.rspec_opts = @rspec_opts
end
desc "NCover Console functional specs"
- Spec::Rake::SpecTask.new :ncoverconsole do |t|
- t.spec_files = FileList['spec/ncoverconsole*_spec.rb']
- t.spec_opts << @spec_opts
+ RSpec::Core::RakeTask.new :ncoverconsole do |t|
+ t.pattern = 'spec/ncoverconsole*_spec.rb'
+ t.rspec_opts = @rspec_opts
end
desc "NCover Report functional specs"
- Spec::Rake::SpecTask.new :ncoverreport do |t|
- t.spec_files = FileList['spec/ncoverreport*_spec.rb']
- t.spec_opts << @spec_opts
+ RSpec::Core::RakeTask.new :ncoverreport do |t|
+ t.pattern = 'spec/ncoverreport*_spec.rb'
+ t.rspec_opts = @rspec_opts
end
desc "Ndepend functional specs"
- Spec::Rake::SpecTask.new :ndepend do |t|
- t.spec_files = FileList['spec/ndepend*_spec.rb']
- t.spec_opts << @spec_opts
+ RSpec::Core::RakeTask.new :ndepend do |t|
+ t.pattern = 'spec/ndepend*_spec.rb'
+ t.rspec_opts = @rspec_opts
end
desc "Zip functional specs"
- Spec::Rake::SpecTask.new :zip do |t|
- t.spec_files = FileList['spec/zip*_spec.rb']
- t.spec_opts << @spec_opts
+ RSpec::Core::RakeTask.new :zip do |t|
+ t.pattern = 'spec/zip*_spec.rb'
+ t.rspec_opts = @rspec_opts
end
desc "XUnit functional specs"
- Spec::Rake::SpecTask.new :xunit do |t|
- t.spec_files = FileList['spec/xunit*_spec.rb']
- t.spec_opts << @spec_opts
+ RSpec::Core::RakeTask.new :xunit do |t|
+ t.pattern = 'spec/xunit*_spec.rb'
+ t.rspec_opts = @rspec_opts
end
desc "NUnit functional specs"
- Spec::Rake::SpecTask.new :nunit do |t|
- t.spec_files = FileList['spec/nunit*_spec.rb']
- t.spec_opts << @spec_opts
+ RSpec::Core::RakeTask.new :nunit do |t|
+ t.pattern = 'spec/nunit*_spec.rb'
+ t.rspec_opts = @rspec_opts
end
desc "MSTest functional specs"
- Spec::Rake::SpecTask.new :mstest do |t|
- t.spec_files = FileList['spec/mstest*_spec.rb']
- t.spec_opts << @spec_opts
+ RSpec::Core::RakeTask.new :mstest do |t|
+ t.pattern = 'spec/mstest*_spec.rb'
+ t.rspec_opts = @rspec_opts
end
desc "MSpec functional specs"
- Spec::Rake::SpecTask.new :mspec do |t|
- t.spec_files = FileList['spec/mspec*_spec.rb']
- t.spec_opts << @spec_opts
+ RSpec::Core::RakeTask.new :mspec do |t|
+ t.pattern = 'spec/mspec*_spec.rb'
+ t.rspec_opts = @rspec_opts
end
desc "Exec functional specs"
- Spec::Rake::SpecTask.new :exec do |t|
- t.spec_files = FileList['spec/exec*_spec.rb']
- t.spec_opts << @spec_opts
+ RSpec::Core::RakeTask.new :exec do |t|
+ t.pattern = 'spec/exec*_spec.rb'
+ t.rspec_opts = @rspec_opts
end
desc "Docu functional specs"
- Spec::Rake::SpecTask.new :docu do |t|
- t.spec_files = FileList['spec/docu*_spec.rb']
- t.spec_opts << @spec_opts
+ RSpec::Core::RakeTask.new :docu do |t|
+ t.pattern = 'spec/docu*_spec.rb'
+ t.rspec_opts = @rspec_opts
end
desc "YAML Config functional specs"
- Spec::Rake::SpecTask.new :yamlconfig do |t|
- t.spec_files = FileList['spec/yaml*_spec.rb']
- t.spec_opts << @spec_opts
+ RSpec::Core::RakeTask.new :yamlconfig do |t|
+ t.pattern = 'spec/yaml*_spec.rb'
+ t.rspec_opts = @rspec_opts
end
desc "FluenMigrator functional specs"
- Spec::Rake::SpecTask.new :fluentmigrator do |t|
- t.spec_files = FileList['spec/fluentmigrator*_spec.rb']
- t.spec_opts << @spec_opts
+ RSpec::Core::RakeTask.new :fluentmigrator do |t|
+ t.pattern = 'spec/fluentmigrator*_spec.rb'
+ t.rspec_opts = @rspec_opts
end
desc "Output functional specs"
- Spec::Rake::SpecTask.new :output do |t|
- t.spec_files = FileList['spec/output*_spec.rb']
- t.spec_opts << @spec_opts
+ RSpec::Core::RakeTask.new :output do |t|
+ t.pattern = 'spec/output*_spec.rb'
+ t.rspec_opts = @rspec_opts
end
desc "NChurn functional specs"
- Spec::Rake::SpecTask.new :nchurn do |t|
- t.spec_files = FileList['spec/nchurn*_spec.rb']
- t.spec_opts << @spec_opts
+ RSpec::Core::RakeTask.new :nchurn do |t|
+ t.pattern = 'spec/nchurn*_spec.rb'
+ t.rspec_opts = @rspec_opts
end
end
View
@@ -74,17 +74,18 @@
end
end
-shared_context "language engines", :subject => :subject do
- before do
- end
-end
+#shared_context "language engines", :subject => :subject do
+# before do
+# end
+#end
describe CSharpEngine, "when providing custom namespaces and specifying C#" do
- include_context "language engines"
+
+ #include_context "language engines"
before :all do
@tester = AssemblyInfoTester.new
- @tester.lang_engine = c.new
+ @tester.lang_engine = CSharpEngine.new
asm = AssemblyInfo.new
asm.lang_engine = CSharpEngine.new
View
@@ -8,7 +8,6 @@
$: << File.join(@root_dir, "lib/albacore/config")
require 'rubygems'
-require 'spec'
require 'rake/tasklib'
require 'lib/albacore/support/createtask.rb'
require 'lib/albacore/config/config.rb'

0 comments on commit 244437f

Please sign in to comment.