Commit 47acae61
Changed files (5)
config/initializers/delayed_job_config.rb
@@ -4,5 +4,3 @@ Delayed::Worker.max_attempts = 3
Delayed::Worker.max_run_time = 5.minutes
#Delayed::Worker.read_ahead = 10
Delayed::Worker.delay_jobs = !Rails.env.test?
-
-puts "delay jobs? #{Delayed::Worker.delay_jobs}"
spec/spec_helper.rb
@@ -1,36 +1,16 @@
require 'simplecov'
SimpleCov.start 'rails'
-require 'rubygems'
-require 'spork'
+ENV["RAILS_ENV"] ||= 'test'
+require File.expand_path("../../config/environment", __FILE__)
+require 'rspec/rails'
+require 'capybara/rspec'
-
-
-Spork.prefork do
- ENV["RAILS_ENV"] ||= 'test'
- require File.expand_path("../../config/environment", __FILE__)
- require 'rspec/rails'
- require 'capybara/rails'
- require 'capybara/rspec'
-
- Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
- RSpec.configure do |config|
- config.mock_with :rspec
- config.use_transactional_fixtures = true
- config.infer_base_class_for_anonymous_controllers = false
- config.include DeviseHelper, :type => :controller
- end
- module ::RSpec::Core
- class ExampleGroup
- include Capybara::DSL
- end
- end
-end
-
-Spork.each_run do
- # This code will be run each time you run your specs.
- ActiveSupport::Dependencies.clear
- FactoryGirl.reload
- Devise.stretches = 1
- Rails.logger.level = 4
+Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
+RSpec.configure do |config|
+ config.mock_with :rspec
+ config.use_transactional_fixtures = true
+ config.infer_base_class_for_anonymous_controllers = false
+ config.include DeviseHelper, :type => :controller
+ config.order = "random"
end
Gemfile
@@ -8,44 +8,37 @@ gem 'carrierwave'
gem 'carrierwave_backgrounder'
gem 'rmagick'
gem 'kaminari'
-gem 'exception_notification'
gem "formtastic"
gem 'activeadmin'
gem 'sass-rails'
gem 'bootstrap-sass'
gem 'acts_as_commentable_with_threading'
gem 'acts-as-taggable-on'
-gem 'newrelic_rpm'
gem 'delayed_job_active_record'
gem 'daemons'
gem 'jquery-fileupload-rails'
-gem 'simplecov', :require => false, :group => :test
group :development, :test do
gem 'pg'
- gem 'rspec-rails'
gem 'jasmine'
- gem 'sqlite3'
gem 'capistrano'
gem 'capistrano-ext'
gem 'rvm-capistrano'
gem 'capistrano-gitflow'
- gem 'guard-rspec'
- gem 'guard-livereload'
- #gem 'rubber'
end
group :test do
+ gem 'sqlite3'
gem 'rspec-rails'
gem 'factory_girl_rails'
gem 'capybara'
gem 'fakes-rspec'
- gem 'guard-spork'
- gem 'spork'
gem 'rb-readline'
+ gem 'simplecov'
end
group :production do
gem 'pg'
gem 'fog'
+ gem 'newrelic_rpm'
end
group :assets do
gem 'sass-rails'
Gemfile.lock
@@ -1,16 +1,16 @@
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.2.11)
- actionpack (= 3.2.11)
+ actionmailer (3.2.12)
+ actionpack (= 3.2.12)
mail (~> 2.4.4)
- actionpack (3.2.11)
- activemodel (= 3.2.11)
- activesupport (= 3.2.11)
+ actionpack (3.2.12)
+ activemodel (= 3.2.12)
+ activesupport (= 3.2.12)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
- rack (~> 1.4.0)
+ rack (~> 1.4.5)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
@@ -26,18 +26,18 @@ GEM
meta_search (>= 0.9.2)
rails (>= 3.0.0)
sass (>= 3.1.0)
- activemodel (3.2.11)
- activesupport (= 3.2.11)
+ activemodel (3.2.12)
+ activesupport (= 3.2.12)
builder (~> 3.0.0)
- activerecord (3.2.11)
- activemodel (= 3.2.11)
- activesupport (= 3.2.11)
+ activerecord (3.2.12)
+ activemodel (= 3.2.12)
+ activesupport (= 3.2.12)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.11)
- activemodel (= 3.2.11)
- activesupport (= 3.2.11)
- activesupport (3.2.11)
+ activeresource (3.2.12)
+ activemodel (= 3.2.12)
+ activesupport (= 3.2.12)
+ activesupport (3.2.12)
i18n (~> 0.6)
multi_json (~> 1.0)
acts-as-taggable-on (2.3.3)
@@ -49,16 +49,16 @@ GEM
arbre (1.0.1)
activesupport (>= 3.0.0)
arel (3.0.2)
- awesome_nested_set (2.1.5)
+ awesome_nested_set (2.1.6)
activerecord (>= 3.0.0)
bcrypt-ruby (3.0.1)
- bootstrap-sass (2.2.2.0)
+ bootstrap-sass (2.3.0.0)
sass (~> 3.2)
- bourbon (3.0.1)
+ bourbon (3.1.1)
sass (>= 3.2.0)
thor
builder (3.0.4)
- capistrano (2.14.1)
+ capistrano (2.14.2)
highline
net-scp (>= 1.0.0)
net-sftp (>= 2.0.0)
@@ -79,11 +79,10 @@ GEM
carrierwave (0.8.0)
activemodel (>= 3.2.0)
activesupport (>= 3.2.0)
- carrierwave_backgrounder (0.1.3)
+ carrierwave_backgrounder (0.2.0)
carrierwave (~> 0.5)
- childprocess (0.3.7)
- ffi (~> 1.0, >= 1.0.6)
- coderay (1.0.8)
+ childprocess (0.3.8)
+ ffi (~> 1.0, >= 1.0.11)
coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
railties (~> 3.2.0)
@@ -92,80 +91,50 @@ GEM
execjs
coffee-script-source (1.4.0)
daemons (1.1.9)
- delayed_job (3.0.4)
+ delayed_job (3.0.5)
activesupport (~> 3.0)
- delayed_job_active_record (0.3.3)
+ delayed_job_active_record (0.4.1)
activerecord (>= 2.1.0, < 4)
delayed_job (~> 3.0)
developwithpassion_arrays (0.0.1)
- devise (2.2.2)
+ devise (2.2.3)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.1)
railties (~> 3.1)
warden (~> 1.2.1)
diff-lcs (1.1.3)
- em-websocket (0.4.0)
- eventmachine (>= 0.12.9)
- http_parser.rb (~> 0.5.3)
erubis (2.7.0)
- eventmachine (1.0.0)
- exception_notification (3.0.0)
- actionmailer (>= 3.0.4)
- tinder (~> 1.8)
- excon (0.16.10)
+ excon (0.6.6)
execjs (1.4.0)
multi_json (~> 1.0)
factory_girl (4.2.0)
activesupport (>= 3.0.0)
- factory_girl_rails (4.2.0)
+ factory_girl_rails (4.2.1)
factory_girl (~> 4.2.0)
railties (>= 3.0.0)
- fakes (1.0.2)
+ fakes (1.0.5)
developwithpassion_arrays
fakes-rspec (1.0.2)
fakes
rspec
- faraday (0.8.4)
- multipart-post (~> 1.1)
- faraday_middleware (0.9.0)
- faraday (>= 0.7.4, < 0.9)
fastercsv (1.5.5)
- ffi (1.3.1)
- fog (1.9.0)
+ ffi (1.4.0)
+ fog (0.9.0)
builder
- excon (~> 0.14)
- formatador (~> 0.2.0)
+ excon (~> 0.6.1)
+ formatador (>= 0.1.3)
+ json
mime-types
- multi_json (~> 1.0)
- net-scp (~> 1.0.4)
- net-ssh (>= 2.1.3)
- nokogiri (~> 1.5.0)
+ net-scp (>= 1.0.4)
+ net-ssh (>= 2.1.4)
+ nokogiri (>= 1.4.4)
ruby-hmac
formatador (0.2.4)
formtastic (2.2.1)
actionpack (>= 3.0)
- guard (1.6.2)
- listen (>= 0.6.0)
- lumberjack (>= 1.0.2)
- pry (>= 0.9.10)
- terminal-table (>= 1.4.3)
- thor (>= 0.14.6)
- guard-livereload (1.1.3)
- em-websocket (>= 0.2.0)
- guard (>= 1.5.0)
- multi_json (~> 1.0)
- guard-rspec (2.4.0)
- guard (>= 1.1)
- rspec (~> 2.11)
- guard-spork (1.4.1)
- childprocess (>= 0.2.3)
- guard (>= 1.1)
- spork (>= 0.8.4)
has_scope (0.5.1)
- hashie (1.2.0)
highline (1.6.15)
hike (1.2.1)
- http_parser.rb (0.5.3)
i18n (0.6.1)
inherited_resources (1.3.1)
has_scope (~> 0.5.0)
@@ -177,18 +146,16 @@ GEM
selenium-webdriver (>= 0.1.3)
jasmine-core (1.3.1)
journey (1.0.4)
- jquery-fileupload-rails (0.4.0)
+ jquery-fileupload-rails (0.4.1)
actionpack (>= 3.1)
railties (>= 3.1)
- jquery-rails (2.2.0)
+ jquery-rails (2.2.1)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
- json (1.7.6)
+ json (1.7.7)
kaminari (0.14.1)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
- listen (0.7.2)
- lumberjack (1.0.2)
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
@@ -198,57 +165,51 @@ GEM
activerecord (~> 3.1)
activesupport (~> 3.1)
polyamorous (~> 0.5.0)
- method_source (0.8.1)
- mime-types (1.19)
- multi_json (1.5.0)
- multipart-post (1.1.5)
- net-scp (1.0.4)
- net-ssh (>= 1.99.1)
- net-sftp (2.0.5)
- net-ssh (>= 2.0.9)
- net-ssh (2.6.3)
- net-ssh-gateway (1.1.0)
- net-ssh (>= 1.99.1)
- newrelic_rpm (3.5.6.46)
+ mime-types (1.21)
+ multi_json (1.6.1)
+ net-scp (1.1.0)
+ net-ssh (>= 2.6.5)
+ net-sftp (2.1.1)
+ net-ssh (>= 2.6.5)
+ net-ssh (2.6.5)
+ net-ssh-gateway (1.2.0)
+ net-ssh (>= 2.6.5)
+ newrelic_rpm (3.5.7.59)
nokogiri (1.5.6)
orm_adapter (0.4.0)
pg (0.14.1)
polyamorous (0.5.0)
activerecord (~> 3.0)
polyglot (0.3.3)
- pry (0.9.11.4)
- coderay (~> 1.0.5)
- method_source (~> 0.8)
- slop (~> 3.4)
- rack (1.4.4)
+ rack (1.4.5)
rack-cache (1.2)
rack (>= 0.4)
- rack-ssl (1.3.2)
+ rack-ssl (1.3.3)
rack
rack-test (0.6.2)
rack (>= 1.0)
- rails (3.2.11)
- actionmailer (= 3.2.11)
- actionpack (= 3.2.11)
- activerecord (= 3.2.11)
- activeresource (= 3.2.11)
- activesupport (= 3.2.11)
+ rails (3.2.12)
+ actionmailer (= 3.2.12)
+ actionpack (= 3.2.12)
+ activerecord (= 3.2.12)
+ activeresource (= 3.2.12)
+ activesupport (= 3.2.12)
bundler (~> 1.0)
- railties (= 3.2.11)
- railties (3.2.11)
- actionpack (= 3.2.11)
- activesupport (= 3.2.11)
+ railties (= 3.2.12)
+ railties (3.2.12)
+ actionpack (= 3.2.12)
+ activesupport (= 3.2.12)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
rake (10.0.3)
rb-readline (0.4.2)
- rdoc (3.12)
+ rdoc (3.12.1)
json (~> 1.4)
responders (0.9.3)
railties (~> 3.1)
- rmagick (2.13.1)
+ rmagick (2.13.2)
rspec (2.12.0)
rspec-core (~> 2.12.0)
rspec-expectations (~> 2.12.0)
@@ -256,7 +217,7 @@ GEM
rspec-core (2.12.2)
rspec-expectations (2.12.1)
diff-lcs (~> 1.1.3)
- rspec-mocks (2.12.1)
+ rspec-mocks (2.12.2)
rspec-rails (2.12.2)
actionpack (>= 3.0)
activesupport (>= 3.0)
@@ -273,18 +234,15 @@ GEM
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
- selenium-webdriver (2.29.0)
+ selenium-webdriver (2.30.0)
childprocess (>= 0.2.5)
multi_json (~> 1.0)
rubyzip
websocket (~> 1.0.4)
- simple_oauth (0.1.9)
simplecov (0.7.1)
multi_json (~> 1.0)
simplecov-html (~> 0.7.1)
simplecov-html (0.7.1)
- slop (3.4.3)
- spork (0.9.2)
sprockets (2.2.2)
hike (~> 1.2)
multi_json (~> 1.0)
@@ -292,25 +250,11 @@ GEM
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.7)
stringex (1.5.1)
- terminal-table (1.4.5)
thor (0.17.0)
tilt (1.3.3)
- tinder (1.9.2)
- eventmachine (~> 1.0)
- faraday (~> 0.8)
- faraday_middleware (~> 0.9)
- hashie (~> 1.0)
- json (~> 1.7.5)
- mime-types (~> 1.19)
- multi_json (~> 1.5)
- twitter-stream (~> 0.1)
treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
- twitter-stream (0.1.16)
- eventmachine (>= 0.12.8)
- http_parser.rb (~> 0.5.1)
- simple_oauth (~> 0.1.4)
tzinfo (0.3.35)
uglifier (1.3.0)
execjs (>= 0.3.0)
@@ -339,14 +283,10 @@ DEPENDENCIES
daemons
delayed_job_active_record
devise
- exception_notification
factory_girl_rails
fakes-rspec
fog
formtastic
- guard-livereload
- guard-rspec
- guard-spork
jasmine
jquery-fileupload-rails
jquery-rails
@@ -361,6 +301,5 @@ DEPENDENCIES
rvm-capistrano
sass-rails
simplecov
- spork
sqlite3
uglifier
Guardfile
@@ -1,40 +0,0 @@
-# A sample Guardfile
-# More info at https://github.com/guard/guard#readme
-guard 'livereload', :port => '35728' do
- watch(%r{app/.+\.(erb|haml)})
- watch(%r{app/helpers/.+\.rb})
- watch(%r{(public/|app/assets).+\.(css|js|html)})
- watch(%r{(app/assets/.+\.css)\.scss}) { |m| m[1] }
- watch(%r{(app/assets/.+\.js)\.coffee}) { |m| m[1] }
- watch(%r{config/locales/.+\.yml})
-end
-
-guard 'rspec', :version => 2, :all_after_pass => false, :cli => '--drb' do
- watch(%r{^spec/.+_spec\.rb$})
- watch(%r{^lib/(.+)\.rb$}) { |m| "spec/lib/#{m[1]}_spec.rb" }
- watch('spec/spec_helper.rb') { "spec" }
-
- # Rails example
- watch(%r{^spec/.+_spec\.rb$})
- watch(%r{^app/(.+)\.rb$}) { |m| "spec/#{m[1]}_spec.rb" }
- watch(%r{^lib/(.+)\.rb$}) { |m| "spec/lib/#{m[1]}_spec.rb" }
- watch(%r{^app/controllers/(.+)_(controller)\.rb$}) { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
- watch(%r{^spec/support/(.+)\.rb$}) { "spec" }
- watch('spec/spec_helper.rb') { "spec" }
- watch('config/routes.rb') { "spec/routing" }
- watch('app/controllers/application_controller.rb') { "spec/controllers" }
- # 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' } 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