Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Upgrade RSpec, and Cucumber.

  • Loading branch information...
commit 6b48e2c203897eb572652d670fa65907389b2b4c 1 parent 3868136
@mdub authored
View
7 Gemfile
@@ -1,3 +1,10 @@
source :rubygems
gemspec
+
+gem "rake"
+gem "rspec", "~> 2.6.0"
+gem "cucumber", "~> 1.0.6"
+gem "haml"
+gem "RedCloth"
+gem "rdiscount"
View
8 Rakefile
@@ -4,10 +4,10 @@ Bundler::GemHelper.install_tasks
task :default => :spec
-require 'spec/rake/spectask'
+require "rspec/core/rake_task"
-Spec::Rake::SpecTask.new(:spec) do |t|
- t.spec_opts << ["--color"]
+RSpec::Core::RakeTask.new do |t|
+ t.pattern = 'spec/**/*_spec.rb'
end
task :default => :cucumber
@@ -15,7 +15,7 @@ task :default => :cucumber
require 'cucumber/rake/task'
namespace :cucumber do
-
+
[:wip, :default].each do |profile|
Cucumber::Rake::Task.new(profile) do |t|
View
4 features/support/rspec_matchers.rb
@@ -1,6 +1,6 @@
-require 'spec'
+require 'rspec'
-Spec::Matchers.define :contain do |expected|
+RSpec::Matchers.define :contain do |expected|
match do |actual|
actual.any? { |x| expected === x }
end
View
7 pith.gemspec
@@ -23,13 +23,6 @@ Gem::Specification.new do |gem|
gem.add_runtime_dependency("thin", "~> 1.2.7")
gem.add_runtime_dependency("clamp", "~> 0.3.0")
- gem.add_development_dependency("rake")
- gem.add_development_dependency("rspec", "~> 1.2.9")
- gem.add_development_dependency("cucumber", "~> 0.8.3")
- gem.add_development_dependency("haml")
- gem.add_development_dependency("RedCloth")
- gem.add_development_dependency("rdiscount")
-
gem.require_path = "lib"
gem.files = Dir["lib/**/*", "sample/**/*", "README.markdown", "LICENSE"]
gem.test_files = Dir["Rakefile", "spec/**/*", "features/**/*", "cucumber.yml"]
View
6 spec/spec_helper.rb
@@ -1,18 +1,18 @@
require "rubygems"
require "fileutils"
-
+
$project_dir = Pathname(__FILE__).expand_path.parent.parent
$tmp_dir = $project_dir + "tmp"
$input_dir = $tmp_dir + "input"
$output_dir = $tmp_dir + "output"
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
config.before(:suite) do
[$input_dir, $output_dir].each do |dir|
dir.rmtree if dir.exist?
end
end
-
+
end
Please sign in to comment.
Something went wrong with that request. Please try again.