aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Landauer <matthew@openaustralia.org>2013-03-06 12:42:41 +1100
committerMatthew Landauer <matthew@openaustralia.org>2013-03-06 12:42:41 +1100
commit79d63b1d8f2e5af49099563dfc027c6eab62a56d (patch)
tree579a0b8a2bce8a536b4ed4bc1008bb094c7ecaed
parent760ad672373427f139eaa37701d607bcd338cb7d (diff)
Add webrat gem
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock8
-rw-r--r--spec/spec_helper.rb5
3 files changed, 13 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index 851ed38ff..6eebd2086 100644
--- a/Gemfile
+++ b/Gemfile
@@ -49,6 +49,8 @@ group :test do
gem 'rspec-rails', '~> 1.3.4'
gem 'test-unit', '~> 1.2.3', :platforms => :ruby_19
gem 'coveralls', :require => false
+ # Using webrat because the preferred (capybara) doesn't work out of the box with rspec 1
+ gem 'webrat'
end
group :development do
diff --git a/Gemfile.lock b/Gemfile.lock
index 27f574f4f..4b973280d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -96,9 +96,12 @@ GEM
net-ssh-gateway (1.2.0)
net-ssh (>= 2.6.5)
newrelic_rpm (3.5.4.34)
+ nokogiri (1.5.6)
pg (0.13.2)
polyglot (0.3.3)
rack (1.1.6)
+ rack-test (0.6.2)
+ rack (>= 1.0)
rake (0.9.2.2)
rbx-require-relative (0.0.9)
rdoc (3.12.1)
@@ -159,6 +162,10 @@ GEM
polyglot
polyglot (>= 0.3.1)
vpim (0.695)
+ webrat (0.7.3)
+ nokogiri (>= 1.2.0)
+ rack (>= 1.0)
+ rack-test (>= 0.5.3)
will_paginate (2.3.16)
xapian-full-alaveteli (1.2.9.5)
xml-simple (1.1.1)
@@ -203,6 +210,7 @@ DEPENDENCIES
syslog_protocol
test-unit (~> 1.2.3)
vpim
+ webrat
will_paginate (~> 2.3.11)
xapian-full-alaveteli (~> 1.2.9.5)
xml-simple
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index f41f7aeb2..215a4957c 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -30,8 +30,9 @@ config['REPLY_LATE_AFTER_DAYS'] = 20
require 'fakeweb'
FakeWeb.register_uri(:purge, %r|varnish.localdomain|, :body => "OK")
-# Uncomment the next line to use webrat's matchers
-#require 'webrat/integrations/rspec-rails'
+Webrat.configure do |config|
+ config.mode = :rails
+end
# Use test-specific translations
FastGettext.add_text_domain 'app', :path => File.join(File.dirname(__FILE__), 'fixtures', 'locale'), :type => :po