Merge release/5.0 into dev

.travis.yml

@@ -0,0 +1,115 @@
+#-- copyright
+# OpenProject is a project management system.
+# Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# 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.
+#
+# See doc/COPYRIGHT.rdoc for more details.
+#++
+
+# Travis configuration based on the respective OpenProject core configuration.
+# Everything save for the matrix section and additional `before_install`
+# instructions is copied and pasted from the core.
+
+language: ruby
+
+rvm:
+  - 2.2.3
+
+sudo: false
+
+cache:
+  - bundler: true
+  - directories:
+    - frontend/node_modules
+    - frontend/bower_components
+
+bundler_args: --without development production
+
+branches:
+  only:
+    - master
+    - dev
+    - /^(stable|release)\/.*$/
+
+env:
+  global:
+    - CI=true
+    - RAILS_ENV=test
+    - COVERAGE=true
+
+  matrix:
+    - "TEST_SUITE=plugins:spec      DB=mysql"
+    - "TEST_SUITE=plugins:cucumber  DB=mysql"
+
+    - "TEST_SUITE=npm"
+
+    - "TEST_SUITE=spec_legacy       DB=mysql     GROUP_SIZE=2  GROUP=1"
+    - "TEST_SUITE=spec_legacy       DB=mysql     GROUP_SIZE=2  GROUP=2"
+    - "TEST_SUITE=cucumber          DB=mysql     GROUP_SIZE=3  GROUP=1"
+    - "TEST_SUITE=cucumber          DB=mysql     GROUP_SIZE=3  GROUP=2"
+    - "TEST_SUITE=cucumber          DB=mysql     GROUP_SIZE=3  GROUP=3"
+    - "TEST_SUITE=rspec             DB=mysql     GROUP_SIZE=6  GROUP=1"
+    - "TEST_SUITE=rspec             DB=mysql     GROUP_SIZE=6  GROUP=2"
+    - "TEST_SUITE=rspec             DB=mysql     GROUP_SIZE=6  GROUP=3"
+    - "TEST_SUITE=rspec             DB=mysql     GROUP_SIZE=6  GROUP=4"
+    - "TEST_SUITE=rspec             DB=mysql     GROUP_SIZE=6  GROUP=5"
+    - "TEST_SUITE=rspec             DB=mysql     GROUP_SIZE=6  GROUP=6"
+
+before_install:
+  # Custom plugin instructions follow.
+
+  # Move the plugin into a subfolder. The plugin-provided Gemfile.plugins
+  # must refer to this folder.
+  - mkdir -p plugins/this
+  - echo `ls -a | tail -n+3 | grep -v plugins` plugins/this/ | xargs mv
+
+  # Get OpenProject.
+  # Doing the fetch detour as you cannot clone into the current directory.
+  - git init
+  - git remote add openproject https://github.com/opf/openproject.git
+  - git fetch --depth=1 openproject
+  - git checkout openproject/$TRAVIS_BRANCH
+
+  # End of custom plugin instructions.
+
+  - "echo `firefox -v`"
+  - "export DISPLAY=:99.0"
+  - "/sbin/start-stop-daemon --start -v --pidfile ./tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1920x1080x16"
+  - "echo `xdpyinfo -display :99 | grep 'dimensions' | awk '{ print $2 }'`"
+  - travis_retry npm install
+
+  # We need phantomjs 2.0 to get tests passing
+  - mkdir travis-phantomjs
+  - wget https://s3.amazonaws.com/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2 -O $PWD/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2
+  - tar -xvf $PWD/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2 -C $PWD/travis-phantomjs
+  - export PATH=$PWD/travis-phantomjs:$PATH
+
+before_script:
+  - sh script/ci_setup.sh $DB
+
+script:
+  - sh script/ci_runner.sh $TEST_SUITE $GROUP_SIZE $GROUP
+
+addons:
+  firefox: "45.0esr"
+  postgresql: "9.3"

lib/open_project/backlogs/patches/setting_seeder_patch.rb

@@ -63,7 +63,7 @@ module OpenProject::Backlogs::Patches::SettingSeederPatch
 
     def backlogs_configured?
       setting = Hash(Setting[backlogs_setting_name])
-      setting['story_types'].present? && settings['task_type'].present?
+      setting['story_types'].present? && setting['task_type'].present?
     end
 
     def backlogs_setting_name

spec/models/story_spec.rb

@@ -140,9 +140,12 @@ describe Story, type: :model do
           story1
 
           other_project = FactoryGirl.create(:project)
-          version2.project_id = other_project.id
+          version2.update! project_id: other_project.id
+
           story2.fixed_version_id = version2.id
           story2.project = other_project
+          # reset memoized versions to reflect changes above
+          story2.instance_variable_set('@assignable_versions', nil)
           story2.save!
         end