remove Rails 4 deprecations, round 2

Rakefile

@@ -25,9 +25,6 @@ require 'rspec/core/rake_task'
 desc "Run all specs in spec directory (excluding plugin specs)"
 RSpec::Core::RakeTask.new(:spec => 'app:db:test:prepare')
 
-# @deprecation - remove require when we drop Rails 4 support
-require 'sub_test_task_patch'
-
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |t|
   t.libs << 'lib'

app/helpers/fae/application_helper.rb

@@ -60,7 +60,7 @@ def body_class
 
     def change_item_link(change)
       text = "#{change.changeable_type}: "
-      test_source_method = Rails::VERSION::MAJOR > 4 ? :data_source_exists? : :table_exists?
+      test_source_method = :data_source_exists?
 
       if change.changeable_type.exclude?('Fae') && change.changeable_type.exclude?('Page') && !ActiveRecord::Base.connection.send(test_source_method, change.changeable_type.tableize)
         return "#{change.changeable_type}: model destroyed"

app/models/concerns/fae/base_model_concern.rb

@@ -45,12 +45,6 @@ def order_method
         end
       end
 
-      # @depreciation - deprecate in v2.0
-      def filter_all
-        # override this method in your model
-        for_fae_index
-      end
-
       def filter(params)
         # override this method in your model
         for_fae_index

app/views/fae/shared/_form_header.html.slim

@@ -32,12 +32,8 @@ header.content-header.js-content-header
 
   - if subnav.present?
     ul.content-header-subnav#js-content-header-subnav
-      ruby:
-        # @depreciation - remove conditional when Rails 4 support is dropped, below becomes:
-        # link.parameterize(separator: '_')
-        parameterize_argument = Rails::VERSION::MAJOR == 4 ? '_' : { separator: '_' }
       - subnav.each do |link, id_selector|
-        - subnav_item = link.is_a?(Array) ? link : [link, link.parameterize(parameterize_argument)]
+        - subnav_item = link.is_a?(Array) ? link : [link, link.parameterize(separator: '_')]
         li: a href="##{subnav_item[1]}" = subnav_item[0]
 
 - if show_flash_messages

docs/features/filtering.md

@@ -95,16 +95,6 @@ def self.filter(params)
 end
 ```
 
-#### filter_all
-
-There's also a `ModelName#filter_all` which is called when you reset the filter form. This defaults to the `for_fae_index` scope, but you can override it if you need to.
-
-```ruby
-def self.filter_all
-  where.not(name: 'John').order(:position)
-end
-```
-
 ### Fae Filter Form
 
 ```ruby

lib/fae/options.rb

@@ -5,7 +5,7 @@
 module Fae
   # configurable defaults
   class << self
-    mattr_accessor :devise_secret_key, :devise_mailer_sender, :dashboard_exclusions, :max_image_upload_size, :max_file_upload_size, :languages, :recreate_versions, :validation_helpers, :track_changes, :tracker_history_length, :slug_separator, :has_top_nav, :disabled_environments, :per_page, :use_cache
+    mattr_accessor :devise_secret_key, :devise_mailer_sender, :dashboard_exclusions, :max_image_upload_size, :max_file_upload_size, :languages, :recreate_versions, :validation_helpers, :track_changes, :tracker_history_length, :slug_separator, :disabled_environments, :per_page, :use_cache
 
     self.devise_secret_key      = ''
     self.devise_mailer_sender   = 'change-me@example.com'

spec/dummy/Rakefile

@@ -1,9 +1,6 @@
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
-# @deprecation - remove require after deprecating Rails 4
-require_relative '../../lib/sub_test_task_patch'
-
 require File.expand_path('../config/application', __FILE__)
 
 Rails.application.load_tasks

spec/dummy/app/views/admin/aromas/table.html.slim

@@ -1,4 +1,4 @@
-= render 'fae/shared/nested_table_advanced',
+= render 'fae/shared/nested_table',
   assoc: :aromas,
   parent_item: @parent_item,
   cols: [{ attr: :name, title: 'Pew Pew' }, :live, :image, { attr: :cat_size, title: 'Kitten Count' }],

spec/dummy/config/application.rb

@@ -19,7 +19,6 @@ class Application < Rails::Application
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
     config.i18n.available_locales = [:en, :zh]
-    config.active_record.raise_in_transactional_callbacks = true if Rails::VERSION::MAJOR >= 4 && Rails::VERSION::MINOR >= 2
 
     config.action_controller.include_all_helpers = false
   end

spec/dummy/config/environments/test.rb

@@ -13,15 +13,9 @@
   config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance.
-  if Rails::VERSION::MAJOR <= 4
-    # The following settings are depreciated in Rails 5
-    config.serve_static_files  = true
-    config.static_cache_control = 'public, max-age=3600'
-  else
-    config.public_file_server.enabled  = true
-    config.public_file_server.headers = 'public, max-age=3600'
-    config.action_mailer.default_url_options = { host: '127.0.0.1'  }
-  end
+  config.public_file_server.enabled  = true
+  config.public_file_server.headers = 'public, max-age=3600'
+  config.action_mailer.default_url_options = { host: '127.0.0.1'  }
 
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true

spec/dummy/config/initializers/fae.rb

@@ -12,7 +12,4 @@
     ja: 'Japanese'
   }
 
-  # has_top_nav has been deprecated, but keeping in to ensure definition doesn't rasie exceptions
-  config.has_top_nav = true
-
 end

spec/requests/fae/changes_spec.rb

@@ -4,11 +4,7 @@
 
   it 'should update Fae::Change.current_user with current_user' do
     user = create_super_user
-    if Rails::VERSION::MAJOR > 4
-      post fae.user_session_path, params: { user: { 'email' => user.email, 'password' => user.password } }
-    else
-      post_via_redirect fae.user_session_path, 'user[email]' => user.email, 'user[password]' => user.password
-    end
+    post fae.user_session_path, params: { user: { 'email' => user.email, 'password' => user.password } }
 
     get fae.root_path
 

spec/requests/fae/setup_spec.rb

@@ -62,11 +62,7 @@
       password_confirmation: 'password'
     }
 
-    if Rails::VERSION::MAJOR > 4
-      post fae.first_user_path, params: { user: user_params }
-    else
-      post fae.first_user_path, user: user_params
-    end
+    post fae.first_user_path, params: { user: user_params }
 
     expect(response).to redirect_to(fae.root_path)
   end

spec/requests/fae/utilites_spec.rb

@@ -23,31 +23,20 @@
     it "shouldn't be able to toggle user's active attr" do
       create_super_user
 
-      if Rails::VERSION::MAJOR > 4
-        post '/admin/toggle/fae_users/1/active', as: :js
-        follow_redirect!
-
-        expect(response.body).to include(I18n.t(:devise)[:failure][:unauthenticated])
-      else
-        post '/admin/toggle/fae_users/1/active', format: :js
-        expect(response.status).to eq(401)
-      end
+      post '/admin/toggle/fae_users/1/active', as: :js
+      follow_redirect!
+
+      expect(response.body).to include(I18n.t(:devise)[:failure][:unauthenticated])
     end
 
     it "shouldn't be able to toggle release's on_prod attr" do
       create_super_user
       release = FactoryGirl.create(:release)
 
-      if Rails::VERSION::MAJOR > 4
-        post "/admin/toggle/releases/#{release.id}/on_prod", as: :js
-        follow_redirect!
-
-        expect(response.body).to include(I18n.t(:devise)[:failure][:unauthenticated])
-      else
-        post "/admin/toggle/releases/#{release.id}/on_prod", format: :js
+      post "/admin/toggle/releases/#{release.id}/on_prod", as: :js
+      follow_redirect!
 
-        expect(response.status).to eq(401)
-      end
+      expect(response.body).to include(I18n.t(:devise)[:failure][:unauthenticated])
     end
   end
 

spec/spec_helper.rb

@@ -64,12 +64,10 @@
   # config.allow_url('gravatar.com')
 
   # https://github.com/rails/rails-controller-testing#rspec
-  if Rails::VERSION::MAJOR > 4
-    [:controller, :view, :request].each do |type|
-      config.include ::Rails::Controller::Testing::TestProcess, :type => type
-      config.include ::Rails::Controller::Testing::TemplateAssertions, :type => type
-      config.include ::Rails::Controller::Testing::Integration, :type => type
-    end
+  [:controller, :view, :request].each do |type|
+    config.include ::Rails::Controller::Testing::TestProcess, :type => type
+    config.include ::Rails::Controller::Testing::TemplateAssertions, :type => type
+    config.include ::Rails::Controller::Testing::Integration, :type => type
   end
 end
 

spec/support/devise_support.rb

@@ -38,15 +38,11 @@ def login(user)
 
 module SignInRequestHelper
   def login(user)
-    if Rails::VERSION::MAJOR > 4
-      post fae.user_session_path, params: { user: { 'email' => user.email, 'password' => user.password } }
+    post fae.user_session_path, params: { user: { 'email' => user.email, 'password' => user.password } }
 
-      # this should work, but it's effecting the route variables, possible related to
-      # https://github.com/plataformatec/devise/issues/4127
-      # follow_redirect!
-    else
-      post_via_redirect fae.user_session_path, 'user[email]' => user.email, 'user[password]' => user.password
-    end
+    # this should work, but it's effecting the route variables, possible related to
+    # https://github.com/plataformatec/devise/issues/4127
+    # follow_redirect!
   end
 end