Fix tests

Author: thorin

.travis.yml

@@ -1,56 +1,34 @@
 ---
 language: ruby
 sudo: false
+cache: bundler
 addons:
   apt:
     packages:
       - ldap-utils
       - slapd
-timeouts:
-  bundle: 600
 rvm:
  - 1.8.7
  - 1.9.3
- - 2.0.0
+ - 2.2
 env:
   global: REDMINE_DIR=./workspace/redmine
   matrix:
-   - REDMINE=2.5.3
    - REDMINE=2.6-stable
-   - REDMINE=v3.8.0
+   - REDMINE=3.2-stable
    - REDMINE=master
 matrix:
-  include:
-   - rvm: 2.2.2
-     env: REDMINE=master
-     gemfile: workspace/redmine/Gemfile
-   - rvm: 2.1.6
-     env: REDMINE=master
-     gemfile: workspace/redmine/Gemfile
-   - rvm: 2.1.6
-     env: REDMINE=2.6-stable
-     gemfile: workspace/redmine/Gemfile
   exclude:
    - rvm: 1.8.7
-     env: REDMINE=master
-     gemfile: workspace/redmine/Gemfile
+     env: REDMINE=3.2-stable
    - rvm: 1.8.7
-     env: REDMINE=v3.8.0
-     gemfile: workspace/redmine/Gemfile
-   - rvm: 2.0.0
-     env: REDMINE=v3.8.0
-     gemfile: workspace/redmine/Gemfile
-   - rvm: 2.0.0
      env: REDMINE=master
-     gemfile: workspace/redmine/Gemfile
-  allow_failures:
-   - env: REDMINE=v3.8.0
 gemfile: workspace/redmine/Gemfile
+bundler_args: "--gemfile workspace/redmine/Gemfile --path workspace/redmine/vendor/bundle --without development rmagick"
 before_install:
  - ./script/ci.sh clone_redmine --target $REDMINE_DIR
  - cp ./config/database.yml.travis $REDMINE_DIR/config/database.yml
  - ./script/ci.sh install_plugin_gemfile
-install: ./script/ci.sh bundle_install
 before_script:
  - mysql -e 'CREATE DATABASE redmine CHARACTER SET utf8;'
  - ./script/ci.sh prepare_redmine
@@ -59,4 +37,4 @@ before_script:
  - 'phantomjs --webdriver 4444 2>&- 1>&- &'
 script:
  - ./script/ci.sh run_tests
- - ./script/ci.sh test_uninstall
+ - ./script/ci.sh test_uninstall

app/models/ldap_setting.rb

@@ -68,8 +68,6 @@ class LdapSetting
 
   [:login, *User::STANDARD_FIELDS].each {|f| module_eval("def #{f}; auth_source_ldap.attr_#{f}; end") }
 
-  LdapError = (Gem.loaded_specs['net-ldap'].version.to_s >= '0.12.0' ? Net::LDAP::Error : Net::LDAP::LdapError)
-
   def id
     @auth_source_ldap_id
   end
@@ -288,7 +286,7 @@ def validate_groupname_pattern
 
     def validate_group_filter
       Net::LDAP::Filter.construct(group_search_filter) if group_search_filter.present?
-    rescue LdapError
+    rescue Net::LDAP::Error
       errors.add :group_search_filter, :invalid
     end
 

config/Gemfile.travis

@@ -1,9 +1,9 @@
 group :test do
-  gem 'coveralls', :require => false
-  if RUBY_VERSION < "1.9.3"
-    gem "rest-client", "~> 1.6.8"
-    gem "simplecov", "~> 0.8.2"
-    gem "rcov", "= 0.9.11"
-    gem "i18n", "~> 0.6.11"
+  if RUBY_VERSION >= "2.0"
+    gem 'coveralls', :require => false
+  end
+  if RUBY_VERSION < "1.9"
+    gem 'i18n', '~> 0.6.11'
+    gem 'rack-cache', '= 1.2'
   end
 end

lib/ldap_sync/core_ext/ber.rb

@@ -1,4 +1,23 @@
+# encoding: utf-8
+# Copyright (C) 2011-2013  The Redmine LDAP Sync Authors
+#
+# This file is part of Redmine LDAP Sync.
+#
+# Redmine LDAP Sync 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 3 of the License, or
+# (at your option) any later version.
+#
+# Redmine LDAP Sync 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 Redmine LDAP Sync.  If not, see <http://www.gnu.org/licenses/>.
 if ('0.12.0'..'0.13.0') === Gem.loaded_specs['net-ldap'].version.to_s
+  require 'net/ber'
+
   ##
   # A String object with a BER identifier attached.
   #

lib/ldap_sync/core_ext/ldap.rb

@@ -0,0 +1,24 @@
+# encoding: utf-8
+# Copyright (C) 2011-2013  The Redmine LDAP Sync Authors
+#
+# This file is part of Redmine LDAP Sync.
+#
+# Redmine LDAP Sync 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 3 of the License, or
+# (at your option) any later version.
+#
+# Redmine LDAP Sync 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 Redmine LDAP Sync.  If not, see <http://www.gnu.org/licenses/>.
+require 'net/ldap'
+
+class Net::LDAP
+  if Gem.loaded_specs['net-ldap'].version < Gem::Version.new('0.12.0')
+    Error = LdapError
+  end
+end

lib/ldap_sync/core_ext/ldap_entry.rb

@@ -15,6 +15,8 @@
 #
 # 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 'net/ldap'
+
 class Net::LDAP
   class Entry
     include Enumerable

lib/ldap_sync/core_ext/string.rb

@@ -18,7 +18,7 @@
 require 'net/ldap'
 
 module Net::BER::Extensions::String
-  if Gem.loaded_specs['net-ldap'].version.to_s < '0.12.0'
+  if Gem.loaded_specs['net-ldap'].version < Gem::Version.new('0.12.0')
     def raw_utf8_encoded
       if self.respond_to?(:encode) && self.encoding.name != 'ASCII-8BIT'
         self.encode('UTF-8').force_encoding('ASCII-8BIT')

lib/ldap_sync/entity_manager.rb

@@ -21,8 +21,6 @@ module LdapSync::EntityManager
     def connect_as_user?; setting.account.include?('$login'); end
 
   private
-    LdapError = (Gem.loaded_specs['net-ldap'].version.to_s >= '0.12.0' ? Net::LDAP::Error : Net::LDAP::LdapError)
-
     def get_user_fields(username, user_data=nil, options={})
       fields_to_sync = setting.user_fields_to_sync
       if options.try(:fetch, :include_required, false)
@@ -318,7 +316,7 @@ def ldap_search(ldap, options, &block)
       result.map {|e| e[attrs] } unless block_given? || result.nil?
     rescue => exception
       os = ldap.get_operation_result
-      raise LdapError, "LDAP Error(#{os.code}): #{os.message}"
+      raise Net::LDAP::Error, "LDAP Error(#{os.code}): #{os.message}"
     end
 
     def n(field)

script/ci.sh

@@ -12,30 +12,17 @@ setenv() {
   fi
   if [ "$VERBOSE" = "yes" ]; then export TRACE=--trace; fi
   if [ ! "$VERBOSE" = "yes" ]; then export QUIET=--quiet; fi
-  if [[ "$RUBY_VERSION" < "1.9" ]]; then export RUBYGEMS=2.1.11; fi
 
   case $REDMINE in
     2.*.*)  export PATH_TO_PLUGINS=./plugins # for redmine 2.x.x
-            export GENERATE_SECRET=generate_secret_token
-            export MIGRATE_PLUGINS=redmine:plugins
             export REDMINE_TARBALL=https://github.com/edavis10/redmine/archive/$REDMINE.tar.gz
             ;;
-    2.*-stable) export PATH_TO_PLUGINS=./plugins # for redmine 2.x-stable
-            export GENERATE_SECRET=generate_secret_token
-            export MIGRATE_PLUGINS=redmine:plugins
+    *.*-stable) export PATH_TO_PLUGINS=./plugins # for redmine 2.x-stable
             export REDMINE_SVN_REPO=http://svn.redmine.org/redmine/branches/$REDMINE
             ;;
     master) export PATH_TO_PLUGINS=./plugins
-            export GENERATE_SECRET=generate_secret_token
-            export MIGRATE_PLUGINS=redmine:plugins
             export REDMINE_SVN_REPO=http://svn.redmine.org/redmine/trunk/
             ;;
-    v3.8.0) export PATH_TO_PLUGINS=./vendor/chiliproject_plugins
-            export GENERATE_SECRET=generate_session_store
-            export MIGRATE_PLUGINS=db:migrate:plugins
-            export REDMINE_TARBALL=https://github.com/chiliproject/chiliproject/archive/$REDMINE.tar.gz
-            export RUBYGEMS=1.8.29
-            ;;
     *)      echo "Unsupported platform $REDMINE"
             exit 1
             ;;
@@ -78,9 +65,6 @@ clone_redmine()
     mkdir -p $TARGET
     wget $REDMINE_TARBALL -O- | tar -C $TARGET -xz --strip=1 --show-transformed -f -
   fi
-
-  # Temporarily pin down database_cleaner for bug with sqlite, see https://github.com/bmabey/database_cleaner/issues/224
-  sed -ri 's/gem "database_cleaner"/gem "database_cleaner", "< 1.1.0"/' $TARGET/Gemfile
 }
 
 install_plugin_gemfile()
@@ -91,20 +75,6 @@ install_plugin_gemfile()
   ln -s "$PATH_TO_LDAPSYNC/config/Gemfile.travis" "$REDMINE_DIR/$PATH_TO_PLUGINS/redmine_ldap_sync/Gemfile"
 }
 
-bundle_install()
-{
-  setenv
-
-  if [ -n "${RUBYGEMS}" ]; then
-    rvm rubygems ${RUBYGEMS} --force
-  fi
-  pushd $REDMINE_DIR 1> /dev/null
-  for i in {1..3}; do
-    gem install bundler $QUIET --no-rdoc --no-ri && \
-    bundle install $QUIET --gemfile=./Gemfile --path vendor/bundle --without development rmagick && break
-  done && popd 1> /dev/null
-}
-
 prepare_redmine()
 {
   setenv
@@ -118,7 +88,7 @@ prepare_redmine()
   bundle exec rake redmine:load_default_data REDMINE_LANG=en $TRACE
 
   trace 'Session token'
-  bundle exec rake $GENERATE_SECRET $TRACE
+  bundle exec rake generate_secret_token $TRACE
 
   popd 1> /dev/null
 }
@@ -132,7 +102,7 @@ prepare_plugin()
   ln -s $PATH_TO_LDAPSYNC/* $PATH_TO_PLUGINS/redmine_ldap_sync
 
   trace 'Prepare plugins'
-  bundle exec rake $MIGRATE_PLUGINS NAME=redmine_ldap_sync $TRACE
+  bundle exec rake redmine:plugins NAME=redmine_ldap_sync $TRACE
 
   popd 1> /dev/null
 }
@@ -179,7 +149,7 @@ run_tests()
 
   pushd $REDMINE_DIR 1> /dev/null
 
-  if [ "$REDMINE" == "master" ] && [ "$RUBY_VERSION"  == "2.2.2" ]; then
+  if [ "$REDMINE" == "master" ] && [ "$RUBY_VERSION"  == "2.2" ]; then
     bundle exec rake redmine:plugins:ldap_sync:coveralls:test $TRACE
   else
     bundle exec rake redmine:plugins:ldap_sync:test $TRACE
@@ -194,15 +164,14 @@ test_uninstall()
 
   pushd $REDMINE_DIR 1> /dev/null
 
-  bundle exec rake $TRACE $MIGRATE_PLUGINS NAME=redmine_ldap_sync VERSION=0
+  bundle exec rake $TRACE redmine:plugins NAME=redmine_ldap_sync VERSION=0
 
   popd 1> /dev/null
 }
 
 case "$1" in
   "clone_redmine") shift; clone_redmine $@;;
   "install_plugin_gemfile") shift; install_plugin_gemfile $@;;
-  "bundle_install") shift; bundle_install $@;;
   "prepare_redmine") shift; prepare_redmine $@;;
   "prepare_plugin") shift; prepare_plugin $@;;
   "start_ldap") shift; start_ldap $@;;

test/test_helper.rb

@@ -16,17 +16,19 @@
 # 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 'simplecov'
+if RUBY_VERSION >= '2.0.0'
+  require 'simplecov'
 
-SimpleCov.start do
-  add_group 'Controllers', 'app/controllers'
-  add_group 'Models', 'app/models'
-  add_group 'Helpers', 'app/helpers'
-  add_group 'Libraries', 'lib'
-  add_filter '/test/'
-  add_filter 'init.rb'
-  root File.expand_path(File.dirname(__FILE__) + '/../')
-end if RUBY_VERSION >= '1.9.0'
+  SimpleCov.start do
+    add_group 'Controllers', 'app/controllers'
+    add_group 'Models', 'app/models'
+    add_group 'Helpers', 'app/helpers'
+    add_group 'Libraries', 'lib'
+    add_filter '/test/'
+    add_filter 'init.rb'
+    root File.expand_path(File.dirname(__FILE__) + '/../')
+  end
+end
 
 require File.expand_path(File.dirname(__FILE__) + '/../../../test/test_helper')
 

test/ui/ldap_setting_test.rb

@@ -18,8 +18,10 @@
 require File.expand_path('../../../../../test/ui/base', __FILE__)
 require File.expand_path('../../test_helper', __FILE__)
 
-require 'simplecov'
-SimpleCov.command_name 'UI Tests'
+if RUBY_VERSION >= '2.0.0'
+  require 'simplecov'
+  SimpleCov.command_name 'UI Tests'
+end
 
 class Redmine::UiTest::LdapSettingTest < Redmine::UiTest::Base
   fixtures :auth_sources, :users, :settings, :custom_fields

test/ui/login_test.rb

@@ -18,8 +18,10 @@
 require File.expand_path('../../../../../test/ui/base', __FILE__)
 require File.expand_path('../../test_helper', __FILE__)
 
-require 'simplecov'
-SimpleCov.command_name 'UI Tests'
+if RUBY_VERSION >= '2.0.0'
+  require 'simplecov'
+  SimpleCov.command_name 'UI Tests'
+end
 
 class Redmine::UiTest::LoginTest < Redmine::UiTest::Base
   fixtures :auth_sources, :users, :settings, :custom_fields, :roles, :projects, :members, :member_roles

test/unit/auth_source_ldap_test.rb

@@ -458,8 +458,8 @@ class AuthSourceLdapTest < ActiveSupport::TestCase
     assert_equal '[email protected]', @user.mail
     assert_equal 'User', @user.firstname
     assert_equal 'Misc', @user.lastname
-    assert_equal 'en', @user.custom_field_values[0].value
-    assert_equal '0', @user.custom_field_values[1].value
+    assert_include @user.custom_field_values[0].value, ['en',nil]
+    assert_include @user.custom_field_values[1].value, ['0', nil]
   end
 
   test "#sync_user should delete groups" do