From 3f3f10222b219798db7731224fd9cf81a895487f Mon Sep 17 00:00:00 2001 From: Praveen Arimbrathodiyil Date: Sun, 18 Sep 2016 19:41:30 +0530 Subject: [PATCH] loosen minitest in Gemfile --- debian/patches/0100-remove-development-test.patch | 3 ++- debian/tests/spec | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/patches/0100-remove-development-test.patch b/debian/patches/0100-remove-development-test.patch index 7dfedfa55a..7c61392794 100644 --- a/debian/patches/0100-remove-development-test.patch +++ b/debian/patches/0100-remove-development-test.patch @@ -56,7 +56,8 @@ Bundler will fail when it can't find these locally +# gem 'spinach-rerun-reporter', '~> 0.0.2' # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) - gem 'minitest', '~> 5.7.0' +- gem 'minitest', '~> 5.7.0' ++ gem 'minitest', '~> 5.7' # Generate Fake data - gem 'ffaker', '~> 2.0.0' diff --git a/debian/tests/spec b/debian/tests/spec index eb2be62080..75461bdb8d 100755 --- a/debian/tests/spec +++ b/debian/tests/spec @@ -18,6 +18,6 @@ su gitlab -c 'truncate -s 0 Gemfile.lock' export $(cat /etc/gitlab/gitlab-debian.conf) export INCLUDE_TEST_DEPENDS="true" -su gitlab -c "bundle install --with development test --local" +su gitlab -c "bundle install --local" su gitlab -c "bundle exec rake -f ${AUTOPKGTEST_TMP}/debian/tests/spec.rake #config 2/2 failed, controllers many failed