Permalink
Browse files

Merge branch 'rspec2'

Conflicts:
	Rakefile
  • Loading branch information...
2 parents 2757697 + c557e90 commit a3b5ce68d590d5427fb662b1bf61d2e379405e27 @orieken orieken committed May 6, 2011
Showing with 14 additions and 13 deletions.
  1. +2 −2 Rakefile
  2. +3 −3 lib/app_generators/taza/templates/spec_helper.rb.erb
  3. +1 −0 lib/taza.rb
  4. +4 −4 lib/taza/tasks.rb
  5. +2 −2 spec/array_spec.rb
  6. +1 −1 spec/spec_helper.rb
  7. +1 −1 taza.gemspec
View
@@ -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
@@ -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
View
@@ -1,4 +1,5 @@
require 'active_support/all'
+require 'rspec'
require 'taza/page'
require 'taza/site'
require 'taza/browser'
View
@@ -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
View
@@ -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
View
@@ -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
View
@@ -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"])

0 comments on commit a3b5ce6

Please sign in to comment.