suspenders 1.9.2 → 1.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69d77473b20593a1671fc134eedd8937e2eac68a
-  data.tar.gz: 4439abee6400c3830f0e47dbe9f5a927743c3286
+  metadata.gz: 0152238c3011c893d503649500d9b5a40fdbbf59
+  data.tar.gz: c27664d7c142b6b9521d9d2c977dfad77d3afc47
 SHA512:
-  metadata.gz: 760f7123d033fa460f83a4785590607f19ffb209b622cfaf39258d40bb302625e362a1d18fec39218a78d2ea11a3299aea64920d33d774d4d3f291797c303b62
-  data.tar.gz: bf566bfb24f13022139d7a060fc24a2e5258ab7ab35cd56b6a67f01463d121757fff0739d0ab897c974d7904287a7710ea96f8f97d0a61f342c22f7444ad8c68
+  metadata.gz: a7d1e9dc555cf3c14a00a5c3f6b455d56ae32835a3e8051138b6892f6d47db504fa462a7e549fd34fc24d3875bf8510817d05c39819daabf2e4c1d75c9aee254
+  data.tar.gz: 78129944dc4b6735352f1a62af7e90900a72a28127d5bbc5c75bb9b5adf277e4c207639ab546e354cca49c14a946da1ae3f1c62e3128bbaa51585a91e32f0360

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    suspenders (1.9.2)
+    suspenders (1.9.3)
       bundler (~> 1.3)
       rails (= 4.0.3)
 

data/NEWS.md

@@ -1,3 +1,8 @@
+1.9.3 (April 13, 2014)
+
+* Use FactoryGirl.lint instead of custom-generated factory-testing code.
+* Fix Delayed::Job <-> Rails 4.1 dependency conflict.
+
 1.9.2 (April 10, 2014)
 
 * Join Heroku apps in bin/setup.

data/lib/suspenders/app_builder.rb

@@ -51,13 +51,8 @@ module Suspenders
       inject_into_class 'config/application.rb', 'Application', config
     end
 
-    def enable_factory_girl_syntax
-      copy_file 'factory_girl_syntax_rspec.rb', 'spec/support/factory_girl.rb'
-    end
-
-    def test_factories_first
-      copy_file 'factories_spec.rb', 'spec/models/factories_spec.rb'
-      append_file 'Rakefile', factories_spec_rake_task
+    def set_up_factory_girl_for_rspec
+      copy_file 'factory_girl_rspec.rb', 'spec/support/factory_girl.rb'
     end
 
     def configure_smtp

data/lib/suspenders/generators/app_generator.rb

@@ -73,8 +73,7 @@ module Suspenders
 
     def setup_test_environment
       say 'Setting up the test environment'
-      build :enable_factory_girl_syntax
-      build :test_factories_first
+      build :set_up_factory_girl_for_rspec
       build :generate_rspec
       build :configure_rspec
       build :use_spring_binstubs

data/lib/suspenders/version.rb

@@ -1,3 +1,3 @@
 module Suspenders
-  VERSION = '1.9.2'
+  VERSION = '1.9.3'
 end

data/spec/support/fake_heroku.rb

@@ -18,7 +18,9 @@ class FakeHeroku
   def self.has_gem_included?(project_path, gem_name)
     gemfile = File.open(File.join(project_path, 'Gemfile'), 'a')
 
-    File.foreach(gemfile).any?{ |line| line.match(/rails_12factor/) }
+    File.foreach(gemfile).any? do |line|
+      line.match(/#{Regexp.quote(gem_name)}/)
+    end
   end
 
   def self.has_created_app_for?(remote_name)

data/templates/Gemfile.erb

@@ -5,7 +5,7 @@ ruby '<%= RUBY_VERSION %>'
 gem 'airbrake'
 gem 'bourbon'
 gem 'coffee-rails'
-gem 'delayed_job_active_record', '>= 4.0.0'
+gem 'delayed_job_active_record'
 gem 'email_validator'
 gem 'flutie'
 gem 'high_voltage'

data/templates/factory_girl_rspec.rb

@@ -0,0 +1,12 @@
+RSpec.configure do |config|
+  config.before(:suite) do
+    begin
+      DatabaseCleaner.start
+      FactoryGirl.lint
+    ensure
+      DatabaseCleaner.clean
+    end
+  end
+
+  config.include FactoryGirl::Syntax::Methods
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: suspenders
 version: !ruby/object:Gem::Version
-  version: 1.9.2
+  version: 1.9.3
 platform: ruby
 authors:
 - thoughtbot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-10 00:00:00.000000000 Z
+date: 2014-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -145,9 +145,7 @@ files:
 - templates/development_seeds.rb
 - templates/disable_xml_params.rb
 - templates/errors.rb
-- templates/factories_spec.rb
-- templates/factories_spec_rake_task.rb
-- templates/factory_girl_syntax_rspec.rb
+- templates/factory_girl_rspec.rb
 - templates/i18n.rb
 - templates/postgresql_database.yml.erb
 - templates/rack_timeout.rb

data/templates/factories_spec.rb

@@ -1,13 +0,0 @@
-require 'spec_helper'
-
-describe 'factories' do
-  FactoryGirl.factories.map(&:name).each do |factory_name|
-    specify "#{factory_name} factory is valid", :factory do
-      factory = build(factory_name)
-
-      if factory.respond_to?(:valid?)
-        expect(factory).to be_valid, factory.errors.full_messages.join(',')
-      end
-    end
-  end
-end

data/templates/factories_spec_rake_task.rb

@@ -1,15 +0,0 @@
-if defined?(RSpec)
-  task(:spec).clear
-
-  desc 'Run all specs'
-  RSpec::Core::RakeTask.new(:spec) do |t|
-    t.rspec_opts = '--tag ~factory'
-  end
-
-  desc 'Run factory specs.'
-  RSpec::Core::RakeTask.new(:factory_specs) do |t|
-    t.pattern = './spec/models/factories_spec.rb'
-  end
-
-  task spec: :factory_specs
-end

data/templates/factory_girl_syntax_rspec.rb

@@ -1,3 +0,0 @@
-RSpec.configure do |config|
-  config.include FactoryGirl::Syntax::Methods
-end