Fix Spork support

kklepper · Aug 17, 2011 · a3c09ec · a3c09ec
1 parent dc361a7
commit a3c09ec
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: git://github.com/FooBarWidget/capybara-webkit.git
-  revision: dc49e5f87587a8f735beebca26ec5800c92fb88c
+  revision: 922d197adfe5bb636f381ecae250744c3e8475cc
   specs:
     capybara-webkit (0.5.0)
       capybara (~> 1.0.0)

diff --git a/app/views/admin/dashboard/new_site.html.erb b/app/views/admin/dashboard/new_site.html.erb
@@ -0,0 +1,7 @@
+<% @title = "Welcome" %>
+<h1>Let's get started!</h1>
+<p>So you want to embed comments on a bunch of web pages.</p>
+
+<p>What's your site's name? Just enter one. If you have more you can add them later.</p>
+
+<p>How do you want to moderate new comments?</p>
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -36,15 +36,9 @@
   # config.mock_with :flexmock
   # config.mock_with :rr
   config.mock_with :rspec
-
-  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
-  config.fixture_path = "#{::Rails.root}/spec/fixtures"
-
-  # We already use database_cleaner.
-  config.use_transactional_fixtures = false
 
   config.before(:each) do
-    if example.metadata[:js]
+    if example.metadata[:type] == :request
       DatabaseCleaner.strategy = :truncation
     else
       DatabaseCleaner.strategy = :transaction