Merge branch 'rspec2'

Conflicts:
	Rakefile

Author: orieken

Rakefile

@@ -1,5 +1,5 @@
 require 'bundler/setup'
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
 Bundler::GemHelper.install_tasks
-Spec::Rake::SpecTask.new
+RSpec::Core::RakeTask.new(:spec)
 task :default => :spec

lib/app_generators/taza/templates/spec_helper.rb.erb

@@ -1,11 +1,11 @@
 ENV['TAZA_ENV'] = "isolation" if ENV['TAZA_ENV'].nil?
 require 'rubygems'
-require 'spec'
+require 'rspec'
 require 'mocha'
 
 lib_path = File.expand_path("#{File.dirname(__FILE__)}/../lib/sites")
 $LOAD_PATH.unshift lib_path unless $LOAD_PATH.include?(lib_path)
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.mock_with :mocha
-end
+end

lib/taza.rb

@@ -1,4 +1,5 @@
 require 'active_support/all'
+require 'rspec'
 require 'taza/page'
 require 'taza/site'
 require 'taza/browser'

lib/taza/tasks.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'rake'
 require 'taglob'
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
 
 def tags
   ENV['TAGS']
@@ -18,9 +18,9 @@ def initialize
       end
 
       def define_spec_task(name,glob_path)
-        Spec::Rake::SpecTask.new name do |t|
-          t.spec_files = Dir.taglob(glob_path,tags)
-          t.spec_opts << spec_opts
+        RSpec::Core::RakeTask.new name do |t|
+          t.pattern = Dir.taglob(glob_path,tags)
+          t.rspec_opts = spec_opts
         end
       end
 

spec/array_spec.rb

@@ -2,10 +2,10 @@
 require 'extensions/array'
 
 describe 'Array Extensions' do
-  it "should know if elements are not equivilent to a subset of those elements" do
+  it "should know if elements are not equivalent to a subset of those elements" do
     [1,2,3].should_not be_equivalent([2,3])
   end
-  it "should know if elements are not equivilent to a larger set including those elements" do
+  it "should know if elements are not equivalent to a larger set including those elements" do
     [1,2,3].should_not be_equivalent([1,2,3,4])
   end  
   it "should know it is equivalent if the same order" do

spec/spec_helper.rb

@@ -4,7 +4,7 @@
 require 'rubigen/helpers/generator_test_helper'
 require 'taza'
 require 'Selenium'
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.mock_with :mocha
 end
 

taza.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency(%q<taglob>, ["~> 1.1.1"])
   s.add_runtime_dependency(%q<rake>, ["~> 0.8.3"])
   s.add_runtime_dependency(%q<mocha>, ["~> 0.9.3"])
-  s.add_runtime_dependency(%q<rspec>, ["~> 1.1.12"])
+  s.add_runtime_dependency(%q<rspec>, ["~> 2.0.0"])
   s.add_runtime_dependency(%q<rubigen>, ["~> 1.5.6"])
   s.add_runtime_dependency(%q<user-choices>, ["~> 1.1.6.1"])
   s.add_runtime_dependency(%q<Selenium>, ["~> 1.1.14"])