Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Upgrade RSpec, and Cucumber.

  • Loading branch information...
commit 6b48e2c203897eb572652d670fa65907389b2b4c 1 parent 3868136
Mike Williams authored
7 Gemfile
... ... @@ -1,3 +1,10 @@
1 1 source :rubygems
2 2
3 3 gemspec
  4 +
  5 +gem "rake"
  6 +gem "rspec", "~> 2.6.0"
  7 +gem "cucumber", "~> 1.0.6"
  8 +gem "haml"
  9 +gem "RedCloth"
  10 +gem "rdiscount"
8 Rakefile
@@ -4,10 +4,10 @@ Bundler::GemHelper.install_tasks
4 4
5 5 task :default => :spec
6 6
7   -require 'spec/rake/spectask'
  7 +require "rspec/core/rake_task"
8 8
9   -Spec::Rake::SpecTask.new(:spec) do |t|
10   - t.spec_opts << ["--color"]
  9 +RSpec::Core::RakeTask.new do |t|
  10 + t.pattern = 'spec/**/*_spec.rb'
11 11 end
12 12
13 13 task :default => :cucumber
@@ -15,7 +15,7 @@ task :default => :cucumber
15 15 require 'cucumber/rake/task'
16 16
17 17 namespace :cucumber do
18   -
  18 +
19 19 [:wip, :default].each do |profile|
20 20
21 21 Cucumber::Rake::Task.new(profile) do |t|
4 features/support/rspec_matchers.rb
... ... @@ -1,6 +1,6 @@
1   -require 'spec'
  1 +require 'rspec'
2 2
3   -Spec::Matchers.define :contain do |expected|
  3 +RSpec::Matchers.define :contain do |expected|
4 4 match do |actual|
5 5 actual.any? { |x| expected === x }
6 6 end
7 pith.gemspec
@@ -23,13 +23,6 @@ Gem::Specification.new do |gem|
23 23 gem.add_runtime_dependency("thin", "~> 1.2.7")
24 24 gem.add_runtime_dependency("clamp", "~> 0.3.0")
25 25
26   - gem.add_development_dependency("rake")
27   - gem.add_development_dependency("rspec", "~> 1.2.9")
28   - gem.add_development_dependency("cucumber", "~> 0.8.3")
29   - gem.add_development_dependency("haml")
30   - gem.add_development_dependency("RedCloth")
31   - gem.add_development_dependency("rdiscount")
32   -
33 26 gem.require_path = "lib"
34 27 gem.files = Dir["lib/**/*", "sample/**/*", "README.markdown", "LICENSE"]
35 28 gem.test_files = Dir["Rakefile", "spec/**/*", "features/**/*", "cucumber.yml"]
6 spec/spec_helper.rb
... ... @@ -1,18 +1,18 @@
1 1 require "rubygems"
2 2
3 3 require "fileutils"
4   -
  4 +
5 5 $project_dir = Pathname(__FILE__).expand_path.parent.parent
6 6 $tmp_dir = $project_dir + "tmp"
7 7 $input_dir = $tmp_dir + "input"
8 8 $output_dir = $tmp_dir + "output"
9 9
10   -Spec::Runner.configure do |config|
  10 +RSpec.configure do |config|
11 11
12 12 config.before(:suite) do
13 13 [$input_dir, $output_dir].each do |dir|
14 14 dir.rmtree if dir.exist?
15 15 end
16 16 end
17   -
  17 +
18 18 end

0 comments on commit 6b48e2c

Please sign in to comment.
Something went wrong with that request. Please try again.