Permalink
Browse files

Use RSpec 2.0

  • Loading branch information...
1 parent 1b6cbdb commit b0e7f1e8d335e4cfb4bc517cfe97d73bd9f01777 @jarib committed Oct 11, 2010
@@ -1,4 +1,4 @@
-require File.expand_path("../spec_helper", __FILE__)
+require File.expand_path("../watirspec/spec_helper", __FILE__)
describe "Browser" do
View
@@ -1,4 +1,4 @@
-require File.expand_path("../spec_helper", __FILE__)
+require File.expand_path("../watirspec/spec_helper", __FILE__)
describe "Browser" do
describe "#new" do
View
@@ -1,4 +1,4 @@
-require File.expand_path("../spec_helper", __FILE__)
+require File.expand_path("../watirspec/spec_helper", __FILE__)
describe "Button" do
@@ -1,4 +1,4 @@
-require File.expand_path("../spec_helper", __FILE__)
+require File.expand_path("../watirspec/spec_helper", __FILE__)
describe "ClickableElement" do
@@ -1,4 +1,4 @@
-require File.expand_path("../spec_helper", __FILE__)
+require File.expand_path("../watirspec/spec_helper", __FILE__)
describe "DefaultViewer" do
View
@@ -1,5 +1,5 @@
# encoding: utf-8
-require File.expand_path("../spec_helper", __FILE__)
+require File.expand_path("../watirspec/spec_helper", __FILE__)
describe "Element" do
View
@@ -1,5 +1,5 @@
# encoding: utf-8
-require File.expand_path("../spec_helper", __FILE__)
+require File.expand_path("../watirspec/spec_helper", __FILE__)
describe "FileField" do
View
@@ -1,4 +1,4 @@
-require File.expand_path("../spec_helper", __FILE__)
+require File.expand_path("../watirspec/spec_helper", __FILE__)
describe "HtmlUnit bugs" do
describe "HtmlUnit bug 1968686: https://sourceforge.net/tracker/index.php?func=detail&aid=1968686&group_id=47038&atid=448266" do
@@ -1,4 +1,4 @@
-require File.expand_path("../spec_helper", __FILE__)
+require File.expand_path("../watirspec/spec_helper", __FILE__)
describe "Celerity.index_offset" do
View
@@ -1,5 +1,5 @@
# encoding: utf-8
-require File.expand_path("../spec_helper", __FILE__)
+require File.expand_path("../watirspec/spec_helper", __FILE__)
describe "Link" do
View
@@ -2,7 +2,7 @@
describe "Listener" do
before(:each) do
- @web_client = mock("WebClient", :null_object => true)
+ @web_client = mock("WebClient").as_null_object
@listener = Celerity::Listener.new(@web_client)
end
View
@@ -1,5 +1,5 @@
# encoding: utf-8
-require File.expand_path("../spec_helper", __FILE__)
+require File.expand_path("../watirspec/spec_helper", __FILE__)
describe "Table" do
@@ -1,4 +1,4 @@
-require File.expand_path("../spec_helper", __FILE__)
+require File.expand_path("../watirspec/spec_helper", __FILE__)
describe "Button" do
View
@@ -15,7 +15,7 @@ begin
gem.files.reject! { |f| f =~ /^(website|doc|benchmark|log|spec|\.)/}
- gem.add_development_dependency 'rspec'
+ gem.add_development_dependency 'rspec', "~> 2.0.0"
gem.add_development_dependency 'yard'
gem.add_development_dependency 'sinatra', '>= 1.0'
gem.add_development_dependency 'mongrel'
View
@@ -1,11 +1,12 @@
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
- spec.libs << 'lib' << 'spec'
- spec.pattern = 'spec/**/*_spec.rb'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec) do |spec|
+ spec.ruby_opts = "-I lib:spec"
+ spec.pattern = 'spec/**/*_spec.rb'
end
-Spec::Rake::SpecTask.new(:rcov) do |spec|
- spec.libs << 'lib' << 'spec'
+RSpec::Core::RakeTask.new(:rcov) do |spec|
+ spec.ruby_opts = "-I lib:spec"
spec.pattern = 'spec/**/*_spec.rb'
spec.rcov = true
spec.rcov_opts = %w[--exclude spec,fcntl,path_helper,yaml,rack,jruby --include lib/celerity --no-rcovrt]

0 comments on commit b0e7f1e

Please sign in to comment.