Merge branch 'tubbo-feature/sporkify'

.rspec

@@ -3,3 +3,4 @@
 --color
 --tag ~performance
 --order random
+--drb

Gemfile

@@ -149,6 +149,11 @@ group :test do
   gem 'webmock', :require => false
   gem 'sqlite3'
   gem 'mock_redis'
+
+  gem 'spork', '~> 1.0rc'
+  gem 'guard-rspec'
+  gem 'guard-spork'
+  gem 'guard-cucumber'
 end
 
 group :development do

Gemfile.lock

@@ -193,6 +193,17 @@ GEM
     gem_plugin (0.2.3)
     gherkin (2.9.3)
       json (>= 1.4.6)
+    guard (1.0.1)
+      ffi (>= 0.5.0)
+      thor (~> 0.14.6)
+    guard-cucumber (0.7.5)
+      cucumber (>= 0.10)
+      guard (>= 0.8.3)
+    guard-rspec (0.7.0)
+      guard (>= 0.10.0)
+    guard-spork (0.5.2)
+      guard (>= 0.10.0)
+      spork (>= 0.8.4)
     haml (3.1.4)
     handlebars_assets (0.4.1)
       execjs (>= 1.2.9)
@@ -405,6 +416,7 @@ GEM
       rack (~> 1.3, >= 1.3.6)
       rack-protection (~> 1.2)
       tilt (~> 1.3, >= 1.3.3)
+    spork (1.0.0rc2)
     sprockets (2.0.3)
       hike (~> 1.2)
       rack (~> 1.0)
@@ -485,6 +497,9 @@ DEPENDENCIES
   foreigner (~> 1.1.0)
   foreman (= 0.34.1)
   fuubar (= 0.0.6)
+  guard-cucumber
+  guard-rspec
+  guard-spork
   haml
   handlebars_assets
   heroku
@@ -538,6 +553,7 @@ DEPENDENCIES
   sass-rails (= 3.1.4)
   selenium-webdriver (~> 2.16.0)
   settingslogic!
+  spork (~> 1.0rc)
   sqlite3
   thin (~> 1.3.1)
   timecop

Guardfile

@@ -18,3 +18,21 @@ guard 'rspec', :version => 2, :all_on_start => false do
   # Capybara request specs
   watch(%r{^app/views/(.+)/.*\.(erb|haml)$})          { |m| "spec/requests/#{m[1]}_spec.rb" }
 end
+
+guard 'spork', :cucumber_env => { 'RAILS_ENV' => 'test' }, :rspec_env => { 'RAILS_ENV' => 'test' }, :all_on_start => false  do
+  watch('config/application.rb')
+  watch('config/environment.rb')
+  watch(%r{^config/environments/.+\.rb$})
+  watch(%r{^config/initializers/.+\.rb$})
+  watch('Gemfile')
+  watch('Gemfile.lock')
+  watch('spec/spec_helper.rb') { :rspec }
+  watch('test/test_helper.rb') { :test_unit }
+  watch(%r{features/support/}) { :cucumber }
+end
+
+guard 'cucumber' do
+  watch(%r{^features/.+\.feature$})
+  watch(%r{^features/support/.+$})          { 'features' }
+  watch(%r{^features/step_definitions/(.+)_steps\.rb$}) { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'features' }
+end

features/support/env.rb

@@ -1,9 +1,9 @@
-# IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.
-# It is recommended to regenerate this file in the future when you upgrade to a
-# newer version of cucumber-rails. Consider adding your own code to a new file
-# instead of editing this one. Cucumber will automatically load all features/**/*.rb
-# files.
+require 'rubygems'
+require 'spork'
+#uncomment the following line to use spork with the debugger
+#require 'spork/ext/ruby-debug'
 
+Spork.prefork do
   ENV["RAILS_ENV"] ||= "test"
   require 'cucumber/rails'
 
@@ -16,6 +16,7 @@ require 'cucumber/api_steps'
   # Ensure we know the appservers port
   Capybara.server_port = 9887
 
+
   # Capybara defaults to XPath selectors rather than Webrat's default of CSS3. In
   # order to ease the transition to Capybara we set the default here. If you'd
   # prefer to use XPath just remove this line and adjust any selectors in your
@@ -56,6 +57,17 @@ include HelperMethods
   require 'webmock/cucumber'
   WebMock.disable_net_connect!(:allow_localhost => true)
 
+  silence_warnings do
+    SERVICES['facebook'] = {'app_id' => :fake, 'app_secret' => 'sdoigjosdfijg'}
+    AppConfig[:configured_services] << 'facebook'
+  end
+
+  require File.join(File.dirname(__FILE__), "..", "..", "spec", "support", "fake_resque")
+
+  require File.join(File.dirname(__FILE__), 'run_resque_in_process')
+end
+
+Spork.each_run do
   Before do
     @no_follow_diaspora_hq_setting = AppConfig[:no_follow_diasporahq]
     AppConfig[:no_follow_diasporahq] = true
@@ -71,15 +83,6 @@ After do
     end
   end
 
-silence_warnings do
-  SERVICES['facebook'] = {'app_id' => :fake, 'app_secret' => 'sdoigjosdfijg'}
-  AppConfig[:configured_services] << 'facebook'
-end
-
-require File.join(File.dirname(__FILE__), "..", "..", "spec", "support", "fake_resque")
-require File.join(File.dirname(__FILE__), 'run_resque_in_process')
-
-
   Before('@localserver') do
     TestServerFixture.start_if_needed
     CapybaraSettings.instance.save
@@ -90,4 +93,4 @@ end
   After('@localserver') do
     CapybaraSettings.instance.restore
   end
-
+end

spec/spec_helper.rb

@@ -2,6 +2,16 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
+require 'rubygems'
+require 'spork'
+#uncomment the following line to use spork with the debugger
+#require 'spork/ext/ruby-debug'
+
+Spork.prefork do
+  # Loading more in this block will cause your tests to run faster. However,
+  # if you change any configuration or code from libraries loaded here, you'll
+  # need to restart spork for it take effect.
+
   ENV["RAILS_ENV"] ||= 'test'
   require File.join(File.dirname(__FILE__), '..', 'config', 'environment') unless defined?(Rails)
   require 'helper_methods'
@@ -12,6 +22,45 @@ require 'factory_girl'
 
   include HelperMethods
 
+  Dir["#{File.dirname(__FILE__)}/shared_behaviors/**/*.rb"].each do |f|
+    require f
+  end
+
+  ProcessedImage.enable_processing = false
+  UnprocessedImage.enable_processing = false
+
+  def set_up_friends
+    [local_luke, local_leia, remote_raphael]
+  end
+
+  def alice
+    @alice ||= User.where(:username => 'alice').first
+  end
+
+  def bob
+    @bob ||= User.where(:username => 'bob').first
+  end
+
+  def eve
+    @eve ||= User.where(:username => 'eve').first
+  end
+
+  def local_luke
+    @local_luke ||= User.where(:username => 'luke').first
+  end
+
+  def local_leia
+    @local_leia ||= User.where(:username => 'leia').first
+  end
+
+  def remote_raphael
+    @remote_raphael ||= Person.where(:diaspora_handle => 'raphael@remote.net').first
+  end
+
+  def photo_fixture_name
+    @photo_fixture_name = File.join(File.dirname(__FILE__), 'fixtures', 'button.png')
+  end
+
   # Force fixture rebuild
   FileUtils.rm_f(File.join(Rails.root, 'tmp', 'fixture_builder.yml'))
 
@@ -45,46 +94,10 @@ RSpec.configure do |config|
       `rm -rf #{Rails.root}/tmp/uploads/*`
     end
   end
-
-Dir["#{File.dirname(__FILE__)}/shared_behaviors/**/*.rb"].each do |f|
-  require f
 end
 
-
-ProcessedImage.enable_processing = false
-UnprocessedImage.enable_processing = false
-
+Spork.each_run do
+  # This code will be run each time you run your specs.
   AppConfig.load!
   AppConfig.setup!
-
-def set_up_friends
-  [local_luke, local_leia, remote_raphael]
-end
-
-def alice
-  @alice ||= User.where(:username => 'alice').first
-end
-
-def bob
-  @bob ||= User.where(:username => 'bob').first
-end
-
-def eve
-  @eve ||= User.where(:username => 'eve').first
-end
-
-def local_luke
-  @local_luke ||= User.where(:username => 'luke').first
-end
-
-def local_leia
-  @local_leia ||= User.where(:username => 'leia').first
-end
-
-def remote_raphael
-  @remote_raphael ||= Person.where(:diaspora_handle => 'raphael@remote.net').first
-end
-
-def photo_fixture_name
-  @photo_fixture_name = File.join(File.dirname(__FILE__), 'fixtures', 'button.png')
 end