solidus_auth_devise 1.6.4 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2aa5444b3b4f513d26041de6927b83fce140609e
-  data.tar.gz: 814e99c4606750c1adef166de70fbda5a49eed43
+  metadata.gz: c108797540fddc1422f81a6de9cc43f86ab35117
+  data.tar.gz: f704e58ceb69098d53ffa2378a21e2ee7c539ea6
 SHA512:
-  metadata.gz: 4b543060c56aff1657ac4cff719aa50e85c7077d420c8ab146c7e1bc853b698593362f28e955c19c12e7302f5bb1ca1cd9b0f9d8c8c5b644d8db40d309c8042d
-  data.tar.gz: a76c61997cc0294846d6c80d9e620dacdef12802579b7e35dabf16527fa7773d79100b7f264cb08e3f800278c23d0ca53a1e291ae6079ade61c7030781773091
+  metadata.gz: cb5ca1d05ef36b6b5dcf9d57f9a1b8b2a08c09bf581ec1dedb20ad3bce22583f6875ef926ddfcb4c862ce0e54a4573733987b7e9e668c91b3258536e922b7e96
+  data.tar.gz: 5850d15a460988819616678a0b94a69da0a7cd3e07ba76e99e4f51aff1599bf76f0d1666d1dc870a1291c0862c49f69b2352c0c4929022b7051f6b1f870a74ab

data/.travis.yml

@@ -4,8 +4,6 @@ rvm:
   - 2.3.1
 env:
   matrix:
-    - SOLIDUS_BRANCH=v1.0 DB=postgres
-    - SOLIDUS_BRANCH=v1.1 DB=postgres
     - SOLIDUS_BRANCH=v1.2 DB=postgres
     - SOLIDUS_BRANCH=v1.3 DB=postgres
     - SOLIDUS_BRANCH=v1.4 DB=postgres
@@ -14,8 +12,6 @@ env:
     - SOLIDUS_BRANCH=v2.2 DB=postgres
     - SOLIDUS_BRANCH=v2.3 DB=postgres
     - SOLIDUS_BRANCH=master DB=postgres
-    - SOLIDUS_BRANCH=v1.0 DB=mysql
-    - SOLIDUS_BRANCH=v1.1 DB=mysql
     - SOLIDUS_BRANCH=v1.2 DB=mysql
     - SOLIDUS_BRANCH=v1.3 DB=mysql
     - SOLIDUS_BRANCH=v1.4 DB=mysql

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 ## Master (unreleased)
 
+## Solidus Auth Devise v2.0.0 (2017-09-20)
+
+* Drop support for Solidus v1.0 and v1.1
+* Use `match` for Devise logout route
+* Remove references to dash
+* Leverage `*_available?` helpers from `solidus-support`
+* Use `spec_helper` from `solidus-support`
+* Correct `set_current_order` callback for newer versions of Solidus
+
 ## Solidus Auth Devise v1.6.4 (2017-07-24)
 
 * Fix error trying to call helper_method in api-only applications

data/app/models/spree/user.rb

@@ -10,8 +10,6 @@ module Spree
     after_destroy :scramble_email_and_password
     before_update { generate_spree_api_key if encrypted_password_changed? && spree_api_key.present? }
 
-    has_many :orders
-
     before_validation :set_login
 
     users_table_name = User.table_name

data/app/overrides/auth_shared_login_bar.rb

@@ -1,4 +1,4 @@
-if Spree::Auth::Engine.frontend_available?
+if SolidusSupport.frontend_available?
   Deface::Override.new(
     virtual_path: "spree/shared/_nav_bar",
     name: "auth_shared_login_bar",

data/config/routes.rb

@@ -1,6 +1,6 @@
 Spree::Core::Engine.routes.draw do
   if (
-    Spree::Auth::Engine.frontend_available? &&
+    SolidusSupport.frontend_available? &&
     Spree::Auth::Config.draw_frontend_routes
   )
 
@@ -22,7 +22,7 @@ Spree::Core::Engine.routes.draw do
     devise_scope :spree_user do
       get '/login', to: 'user_sessions#new', as: :login
       post '/login', to: 'user_sessions#create', as: :create_new_session
-      get '/logout', to: 'user_sessions#destroy', as: :logout
+      match '/logout', to: 'user_sessions#destroy', as: :logout, via: Devise.sign_out_via
       get '/signup', to: 'user_registrations#new', as: :signup
       post '/signup', to: 'user_registrations#create', as: :registration
       get '/password/recover', to: 'user_passwords#new', as: :recover_password
@@ -39,7 +39,7 @@ Spree::Core::Engine.routes.draw do
   end
 
   if (
-    Spree::Auth::Engine.backend_available? &&
+    SolidusSupport.backend_available? &&
     Spree::Auth::Config.draw_backend_routes
   )
 

data/lib/controllers/frontend/spree/user_confirmations_controller.rb

@@ -1,10 +1,6 @@
 class Spree::UserConfirmationsController < Devise::ConfirmationsController
   helper 'spree/base', 'spree/store'
 
-  if Spree::Auth::Engine.dash_available?
-    helper 'spree/analytics'
-  end
-
   include Spree::Core::ControllerHelpers::Auth
   include Spree::Core::ControllerHelpers::Common
   include Spree::Core::ControllerHelpers::Order

data/lib/controllers/frontend/spree/user_passwords_controller.rb

@@ -1,10 +1,6 @@
 class Spree::UserPasswordsController < Devise::PasswordsController
   helper 'spree/base', 'spree/store'
 
-  if Spree::Auth::Engine.dash_available?
-    helper 'spree/analytics'
-  end
-
   include Spree::Core::ControllerHelpers::Auth
   include Spree::Core::ControllerHelpers::Common
   include Spree::Core::ControllerHelpers::Order

data/lib/controllers/frontend/spree/user_registrations_controller.rb

@@ -1,10 +1,6 @@
 class Spree::UserRegistrationsController < Devise::RegistrationsController
   helper 'spree/base', 'spree/store'
 
-  if Spree::Auth::Engine.dash_available?
-    helper 'spree/analytics'
-  end
-
   include Spree::Core::ControllerHelpers::Auth
   include Spree::Core::ControllerHelpers::Common
   include Spree::Core::ControllerHelpers::Order

data/lib/controllers/frontend/spree/user_sessions_controller.rb

@@ -1,8 +1,5 @@
 class Spree::UserSessionsController < Devise::SessionsController
   helper 'spree/base', 'spree/store'
-  if Spree::Auth::Engine.dash_available?
-    helper 'spree/analytics'
-  end
 
   include Spree::Core::ControllerHelpers::Auth
   include Spree::Core::ControllerHelpers::Common

data/lib/controllers/frontend/spree/users_controller.rb

@@ -1,5 +1,5 @@
 class Spree::UsersController < Spree::StoreController
-  skip_before_action :set_current_order, only: :show
+  skip_before_action :set_current_order, only: :show, raise: false
   prepend_before_action :load_object, only: [:show, :edit, :update]
   prepend_before_action :authorize_actions, only: :new
 

data/lib/spree/auth/engine.rb

@@ -18,8 +18,8 @@ module Spree
       config.to_prepare do
         auth = Spree::Auth::Engine
 
-        auth.prepare_backend if auth.backend_available?
-        auth.prepare_frontend if auth.frontend_available?
+        auth.prepare_backend  if SolidusSupport.backend_available?
+        auth.prepare_frontend if SolidusSupport.frontend_available?
 
         ApplicationController.send :include, Spree::AuthenticationHelpers
       end
@@ -66,24 +66,12 @@ module Spree
         end
       end
 
-      def self.backend_available?
-        defined?(Spree::Backend::Engine) == "constant"
-      end
-
-      def self.dash_available?
-        defined?(Spree::Dash::Engine) == "constant"
-      end
-
-      def self.frontend_available?
-        defined?(Spree::Frontend::Engine) == "constant"
-      end
-
-      if backend_available?
+      if SolidusSupport.backend_available?
         paths["app/controllers"] << "lib/controllers/backend"
         paths["app/views"] << "lib/views/backend"
       end
 
-      if frontend_available?
+      if SolidusSupport.frontend_available?
         paths["app/controllers"] << "lib/controllers/frontend"
         paths["app/views"] << "lib/views/frontend"
       end

data/lib/spree/authentication_helpers.rb

@@ -4,7 +4,7 @@ module Spree
       if receiver.send(:respond_to?, :helper_method)
         receiver.send(:helper_method, :spree_current_user)
 
-        if Spree::Auth::Engine.frontend_available?
+        if SolidusSupport.frontend_available?
           receiver.send(:helper_method, :spree_login_path)
           receiver.send(:helper_method, :spree_signup_path)
           receiver.send(:helper_method, :spree_logout_path)
@@ -16,7 +16,7 @@ module Spree
       current_spree_user
     end
 
-    if Spree::Auth::Engine.frontend_available?
+    if SolidusSupport.frontend_available?
       def spree_login_path
         spree.login_path
       end

data/solidus_auth_devise.gemspec

@@ -3,7 +3,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = "solidus_auth_devise"
-  s.version     = "1.6.4"
+  s.version     = "2.0.0"
   s.summary     = "Provides authentication and authorization services for use with Solidus by using Devise and CanCan."
   s.description = s.summary
 
@@ -18,25 +18,26 @@ Gem::Specification.new do |s|
   s.require_path = "lib"
   s.requirements << "none"
 
-  solidus_version = [">= 1.0.6", "< 3"]
+  solidus_version = [">= 1.2.0", "< 3"]
 
   s.add_dependency "solidus_core", solidus_version
-  s.add_dependency "solidus_support"
+  s.add_dependency "solidus_support", ">= 0.1.3"
   s.add_dependency "devise", '~> 4.1'
   s.add_dependency "devise-encryptable", "0.2.0"
   s.add_dependency 'deface', '~> 1.0'
 
-  s.add_development_dependency "solidus_backend", solidus_version
-  s.add_development_dependency "solidus_frontend", solidus_version
-  s.add_development_dependency "rspec-rails", "~> 3.3"
-  s.add_development_dependency "simplecov", "~> 0.14"
-  s.add_development_dependency "sqlite3"
-  s.add_development_dependency "sass-rails"
+  s.add_development_dependency "capybara", "~> 2.14"
+  s.add_development_dependency "capybara-screenshot"
   s.add_development_dependency "coffee-rails"
-  s.add_development_dependency "shoulda-matchers", "~> 3.1"
+  s.add_development_dependency "database_cleaner", "~> 1.6"
   s.add_development_dependency "factory_girl", "~> 4.4"
-  s.add_development_dependency "capybara", "~> 2.14"
+  s.add_development_dependency "ffaker"
   s.add_development_dependency "poltergeist", "~> 1.5"
-  s.add_development_dependency "database_cleaner", "~> 1.6"
-  s.add_development_dependency "capybara-screenshot"
+  s.add_development_dependency "rspec-rails", "~> 3.3"
+  s.add_development_dependency "sass-rails"
+  s.add_development_dependency "shoulda-matchers", "~> 3.1"
+  s.add_development_dependency "simplecov", "~> 0.14"
+  s.add_development_dependency "solidus_backend", solidus_version
+  s.add_development_dependency "solidus_frontend", solidus_version
+  s.add_development_dependency "sqlite3"
 end

data/spec/spec_helper.rb

@@ -5,9 +5,7 @@ ENV["RAILS_ENV"] ||= "test"
 
 require File.expand_path("../dummy/config/environment.rb", __FILE__)
 
-require "rspec/rails"
-require "shoulda-matchers"
-require "ffaker"
+require "solidus_support/extension/feature_helper"
 
 Dir[File.join(File.dirname(__FILE__), "support/**/*.rb")].each { |f| require f }
 
@@ -15,14 +13,5 @@ RSpec.configure do |config|
   config.infer_spec_type_from_file_location!
   config.raise_errors_for_deprecations!
 
-  config.filter_run focus: true
-  config.run_all_when_everything_filtered = true
-  config.use_transactional_fixtures = false
-  config.order = :random
-
   config.example_status_persistence_file_path = "./spec/examples.txt"
-
-  config.mock_with :rspec do |mock|
-    mock.syntax = [:should, :expect]
-  end
 end

metadata

@@ -1,61 +1,61 @@
 --- !ruby/object:Gem::Specification
 name: solidus_auth_devise
 version: !ruby/object:Gem::Version
-  version: 1.6.4
+  version: 2.0.0
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-24 00:00:00.000000000 Z
+date: 2017-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.6
-    - - "<"
+        version: 1.2.0
+    - - <
       - !ruby/object:Gem::Version
         version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.6
-    - - "<"
+        version: 1.2.0
+    - - <
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
   name: solidus_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.1'
 - !ruby/object:Gem::Dependency
@@ -76,208 +76,222 @@ dependencies:
   name: deface
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: solidus_backend
+  name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.6
-    - - "<"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.6
-    - - "<"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '2.14'
 - !ruby/object:Gem::Dependency
-  name: solidus_frontend
+  name: capybara-screenshot
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.6
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.6
-    - - "<"
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: coffee-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: factory_girl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '4.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '4.4'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: ffaker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sass-rails
+  name: poltergeist
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
-  name: coffee-rails
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
-  name: shoulda-matchers
+  name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl
+  name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '0.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '0.14'
 - !ruby/object:Gem::Dependency
-  name: poltergeist
+  name: solidus_backend
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 1.2.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 1.2.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: solidus_frontend
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 1.2.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 1.2.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: capybara-screenshot
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Provides authentication and authorization services for use with Solidus
@@ -287,9 +301,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE.md
@@ -395,11 +409,8 @@ files:
 - spec/spec_helper.rb
 - spec/support/ability.rb
 - spec/support/authentication_helpers.rb
-- spec/support/capybara.rb
 - spec/support/confirm_helpers.rb
-- spec/support/database_cleaner.rb
 - spec/support/email.rb
-- spec/support/factory_girl.rb
 - spec/support/preferences.rb
 - spec/support/spree.rb
 homepage: 
@@ -412,18 +423,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Provides authentication and authorization services for use with Solidus by
@@ -457,10 +468,7 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/ability.rb
 - spec/support/authentication_helpers.rb
-- spec/support/capybara.rb
 - spec/support/confirm_helpers.rb
-- spec/support/database_cleaner.rb
 - spec/support/email.rb
-- spec/support/factory_girl.rb
 - spec/support/preferences.rb
 - spec/support/spree.rb

data/spec/support/capybara.rb

@@ -1,10 +0,0 @@
-require 'capybara/rspec'
-require 'capybara/rails'
-require 'capybara/poltergeist'
-
-require 'capybara-screenshot/rspec'
-Capybara.save_and_open_page_path = ENV['CIRCLE_ARTIFACTS'] if ENV['CIRCLE_ARTIFACTS']
-
-RSpec.configure do |config|
-  Capybara.javascript_driver = :poltergeist
-end

data/spec/support/database_cleaner.rb

@@ -1,18 +0,0 @@
-require 'database_cleaner'
-
-RSpec.configure do |config|
-
-  config.before(:suite) do
-    DatabaseCleaner.strategy = :transaction
-    DatabaseCleaner.clean_with :truncation
-  end
-
-  config.before do
-    DatabaseCleaner.strategy = RSpec.current_example.metadata[:js] ? :truncation : :transaction
-    DatabaseCleaner.start
-  end
-
-  config.after do
-    DatabaseCleaner.clean
-  end
-end

data/spec/support/factory_girl.rb

@@ -1,5 +0,0 @@
-require 'factory_girl'
-
-RSpec.configure do |config|
-  config.include FactoryGirl::Syntax::Methods
-end