Fix rails 5 tests

Author: thorin

app/models/ldap_setting.rb

@@ -221,6 +221,9 @@ def auth_source_ldap=(source)
   # Sets attributes from attrs that are safe
   # attrs is a Hash with string keys
   def safe_attributes=(attrs, user = User.current)
+    if attrs.respond_to?(:to_unsafe_hash)
+      attrs = attrs.to_unsafe_hash
+    end
     @attributes.merge!(delete_unsafe_attributes(attrs, user))
   end
 

config/Gemfile.travis

@@ -6,4 +6,7 @@ group :test do
     gem 'rack-cache', '= 1.2'
     gem 'test-unit', '~> 3.0.0'
   end
+  if ENV['REDMINE'] == 'master'
+    gem 'rails-controller-testing', '~> 1.0.2'
+  end
 end

test/functional/ldap_settings_controller_test.rb

@@ -45,17 +45,17 @@ def test_should_get_base_settings_js
   end
 
   def test_should_redirect_to_get_edit_on_get_show
-    get :show, :id => 1
+    get :show, params: { id: 1 }
     assert_redirected_to edit_ldap_setting_path(1)
   end
 
   def test_should_get_edit
-    get :edit, :id => @auth_source.id
+    get :edit, params: { id: @auth_source.id }
     assert_response :success
   end
 
   def test_should_get_404
-    get :edit, :id => 999
+    get :edit, params: { id: 999 }
     assert_response :not_found
   end
 
@@ -65,7 +65,7 @@ def test_should_disable_ldap_setting
     assert_equal 'member', @ldap_setting.member_group
 
     # When we do
-    get :disable, :id => @ldap_setting.id
+    get :disable, params: { id: @ldap_setting.id }
     assert_redirected_to ldap_settings_path
     assert_match /success/, flash[:notice]
 
@@ -81,13 +81,13 @@ def test_should_disable_an_invalid_ldap_setting
     assert ldap_setting.active?
 
     # When we do
-    get :disable, :id => ldap_setting.id
+    get :disable, params: { id: ldap_setting.id }
     assert_redirected_to ldap_settings_path
     assert_match /success/, flash[:notice]
 
     # We should have
     ldap_setting = LdapSetting.find_by_auth_source_ldap_id(2)
-    assert_equal nil, ldap_setting.member_group, 'LdapSetting is not the same'
+    assert_nil ldap_setting.member_group, 'LdapSetting is not the same'
     assert !ldap_setting.active?, "LdapSetting must be disabled"
   end
 
@@ -99,7 +99,7 @@ def test_should_enable_ldap_setting
     assert_equal 'member', ldap_setting.member_group
 
     # When we do
-    get :enable, :id => ldap_setting.id
+    get :enable, params: { id: ldap_setting.id }
     assert_redirected_to ldap_settings_path
     assert_match /success/, flash[:notice]
 
@@ -120,7 +120,7 @@ def test_should_not_enable_ldap_setting_with_errors
     assert_equal 'member', @ldap_setting.member_group
 
     # When we do
-    get :enable, :id => @ldap_setting.id
+    get :enable, params: { id: @ldap_setting.id }
     assert_redirected_to ldap_settings_path
     assert_match /invalid settings/, flash[:error]
 
@@ -131,67 +131,76 @@ def test_should_not_enable_ldap_setting_with_errors
   end
 
   def test_should_fail_with_error
-    put :update, :id => @ldap_setting.id, :ldap_setting => {
-      :auth_source_ldap_id => @auth_source_id,
-      :active => true,
-      :groupname => 'cn',
-      :groups_base_dn => 'groups_base_dn',
-      :class_group => 'group',
-      :class_user => nil,                     # Missing required field
-      :group_membership => 'on_members',
-      :groupid => 'groupid',
-      :nested_groups => '',
-      :user_groups => 'memberof',
-      :sync_on_login => '',
-      :dyngroups => ''
+    put :update, params: { 
+      id: @ldap_setting.id, 
+      ldap_setting: {
+        auth_source_ldap_id: @auth_source_id,
+        active: true,
+        groupname: 'cn',
+        groups_base_dn: 'groups_base_dn',
+        class_group: 'group',
+        class_user: nil,                     # Missing required field
+        group_membership: 'on_members',
+        groupid: 'groupid',
+        nested_groups: '',
+        user_groups: 'memberof',
+        sync_on_login: '',
+        dyngroups: ''
+      } 
     }
     assert assigns(:ldap_setting).errors.added?(:class_user, :blank), 'An error must be reported for :class_user'
     assert_response :success
   end
 
   def test_should_update_ldap_setting
-    put :update, :id => @ldap_setting.id, :ldap_setting => {
-      :auth_source_ldap_id => @auth_source_id,
-      :active => true,
-      :account_disabled_test => '',
-      :account_flags => '',
-      :attributes_to_sync => '',
-      :class_group => 'group',
-      :class_user => 'user',
-      :create_groups => '',
-      :create_users => '',
-      :fixed_group => '',
-      :group_memberid => '',
-      :group_membership => 'on_members',
-      :group_parentid => '',
-      :group_search_filter => '',
-      :groupid => 'groupid',
-      :groupname => 'cn',
-      :groupname_pattern => '',
-      :groups_base_dn => 'groups_base_dn',
-      :member => '',
-      :member_group => '',
-      :nested_groups => '',
-      :parent_group => '',
-      :required_group => '',
-      :user_fields_to_sync => [],
-      :group_fields_to_sync => [],
-      :user_ldap_attrs => {},
-      :group_ldap_attrs => {},
-      :user_groups => 'memberof',
-      :user_memberid => '',
-      :sync_on_login => '',
-      :dyngroups => ''
+    put :update, params: { 
+      id: @ldap_setting.id, 
+      ldap_setting: {
+        auth_source_ldap_id: @auth_source_id,
+        active: true,
+        account_disabled_test: '',
+        account_flags: '',
+        attributes_to_sync: '',
+        class_group: 'group',
+        class_user: 'user',
+        create_groups: '',
+        create_users: '',
+        fixed_group: '',
+        group_memberid: '',
+        group_membership: 'on_members',
+        group_parentid: '',
+        group_search_filter: '',
+        groupid: 'groupid',
+        groupname: 'cn',
+        groupname_pattern: '',
+        groups_base_dn: 'groups_base_dn',
+        member: '',
+        member_group: '',
+        nested_groups: '',
+        parent_group: '',
+        required_group: '',
+        user_fields_to_sync: [],
+        group_fields_to_sync: [],
+        user_ldap_attrs: {},
+        group_ldap_attrs: {},
+        user_groups: 'memberof',
+        user_memberid: '',
+        sync_on_login: '',
+        dyngroups: ''
+      }
     }
     assert_redirected_to ldap_settings_path
     assert assigns(:ldap_setting).valid?
     assert_match /success/, flash[:notice]
   end
 
   def test_should_test
-    put :test, :id => @ldap_setting.id, :format => 'text',
-      :ldap_setting => @ldap_setting.send(:attributes),
-      :ldap_test => { :test_users => 'example1', :test_groups => 'Therß' }
+    put :test, params: { 
+      id: @ldap_setting.id,
+      format: 'text', 
+      ldap_setting: @ldap_setting.send(:attributes),
+      ldap_test: { test_users: 'example1', test_groups: 'Therß' }
+    }
 
     assert_response :success
     assert_equal 'text/plain', response.content_type
@@ -211,9 +220,12 @@ def test_should_test
   def test_should_validate_on_test
     @ldap_setting.dyngroups = 'invalid'
 
-    put :test, :id => @ldap_setting.id, :format => 'text',
-      :ldap_setting => @ldap_setting.send(:attributes),
-      :ldap_test => { :test_users => 'example1', :test_groups => 'Therß' }
+    put :test, params: { 
+      id: @ldap_setting.id, 
+      format: 'text',
+      ldap_setting: @ldap_setting.send(:attributes),
+      ldap_test: { :test_users => 'example1', :test_groups => 'Therß' }
+    }
 
     assert_response :success
     assert_equal 'text/plain', response.content_type

test/test_helper.rb

@@ -44,4 +44,21 @@ def clear_ldap_cache!
 
 class ActionDispatch::IntegrationTest
   self.fixture_path = File.expand_path(File.dirname(__FILE__) + '/fixtures')
+end
+
+module ActionController::TestCase::Behavior
+  def process_patched(action, method, *args)
+    options = args.extract_options!
+    if options.present?
+      params = options.delete(:params)
+      options = options.merge(params) if params.present?
+      args << options
+    end
+    process_unpatched(action, method, *args)
+  end
+
+  if Rails::VERSION::MAJOR < 5
+    alias_method :process_unpatched, :process
+    alias_method :process, :process_patched
+  end
 end

test/ui/base.rb

@@ -0,0 +1,78 @@
+# Redmine - project management software
+# Copyright (C) 2006-2017  Jean-Philippe Lang
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+require File.expand_path('../../test_helper', __FILE__)
+require 'capybara/rails'
+
+Capybara.default_driver = :selenium
+Capybara.register_driver :selenium do |app|
+  # Use the following driver definition to test locally using Chrome
+  # (also requires chromedriver to be in PATH)
+  # Capybara::Selenium::Driver.new(app, :browser => :chrome)
+  # Add :switches => %w[--lang=en] to force default browser locale to English
+  # Default for Selenium remote driver is to connect to local host on port 4444 
+  # This can be change using :url => 'http://localhost:9195' if necessary
+  # PhantomJS 1.8 now directly supports Webdriver Wire API,
+  # simply run it with `phantomjs --webdriver 4444`
+  # Add :desired_capabilities => Selenium::WebDriver::Remote::Capabilities.internet_explorer)
+  # to run on Selenium Grid Hub with IE
+  Capybara::Selenium::Driver.new(app, :browser => :remote)
+end
+
+# default: 2
+Capybara.default_wait_time = 2
+
+module Redmine
+  module UiTest
+    # Base class for UI tests
+    class Base < ActionDispatch::IntegrationTest
+      include Capybara::DSL
+
+      # Stop ActiveRecord from wrapping tests in transactions
+      # Transactional fixtures do not work with Selenium tests, because Capybara
+      # uses a separate server thread, which the transactions would be hidden
+      if defined? self.use_transactional_tests
+        self.use_transactional_tests = false
+      else
+        self.use_transactional_fixtures = false
+      end
+
+      # Should not depend on locale since Redmine displays login page
+      # using default browser locale which depend on system locale for "real" browsers drivers
+      def log_user(login, password)
+        visit '/my/page'
+        assert_equal '/login', current_path
+        within('#login-form form') do
+          fill_in 'username', :with => login
+          fill_in 'password', :with => password
+          find('input[name=login]').click
+        end
+        assert_equal '/my/page', current_path
+      end
+
+      setup do
+        # Set the page width higher than 900 to get the full layout with sidebar
+        page.driver.browser.manage.window.resize_to(1024, 900)
+      end
+
+      teardown do
+        Capybara.reset_sessions!    # Forget the (simulated) browser state
+        Capybara.use_default_driver # Revert Capybara.current_driver to Capybara.default_driver
+      end
+    end
+  end
+end

test/ui/ldap_setting_test.rb

@@ -15,8 +15,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Redmine LDAP Sync.  If not, see <http://www.gnu.org/licenses/>.
-require File.expand_path('../../../../../test/ui/base', __FILE__)
-require File.expand_path('../../test_helper', __FILE__)
+require File.expand_path('../base', __FILE__)
 
 if RUBY_VERSION >= '2.0.0'
   require 'simplecov'

test/ui/login_test.rb

@@ -15,8 +15,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Redmine LDAP Sync.  If not, see <http://www.gnu.org/licenses/>.
-require File.expand_path('../../../../../test/ui/base', __FILE__)
-require File.expand_path('../../test_helper', __FILE__)
+require File.expand_path('../base', __FILE__)
 
 if RUBY_VERSION >= '2.0.0'
   require 'simplecov'