From 78d95b6bba969c8e7406c4938ab41cae18b24c46 Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Tue, 18 Dec 2018 23:18:01 +0530 Subject: [PATCH] Relax dependency on rspec-rails --- debian/Gemfile.autopkgtest | 2 +- debian/patches/0460-relax-rspec-rails.patch | 11 +++++++++++ debian/patches/series | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 debian/patches/0460-relax-rspec-rails.patch diff --git a/debian/Gemfile.autopkgtest b/debian/Gemfile.autopkgtest index ff5c574e25..3587e78030 100644 --- a/debian/Gemfile.autopkgtest +++ b/debian/Gemfile.autopkgtest @@ -31,7 +31,7 @@ if ENV["INCLUDE_TEST_DEPENDS"] == "true" gem 'database_cleaner', '~> 1.5.0' gem 'factory_bot_rails', '~> 4.8.2' - gem 'rspec-rails', '~> 3.8.0' # Use packaged version + gem 'rspec-rails', '~> 3.7' # Use packaged version gem 'rspec-retry', '~> 0.4.5' gem 'rspec_profiling', '~> 0.0.5' gem 'rspec-set', '~> 0.1.3' diff --git a/debian/patches/0460-relax-rspec-rails.patch b/debian/patches/0460-relax-rspec-rails.patch new file mode 100644 index 0000000000..3c6aa3beb5 --- /dev/null +++ b/debian/patches/0460-relax-rspec-rails.patch @@ -0,0 +1,11 @@ +--- a/Gemfile ++++ b/Gemfile +@@ -306,7 +306,7 @@ + + gem 'database_cleaner', '~> 1.5.0' + gem 'factory_bot_rails', '~> 4.8.2' +- gem 'rspec-rails', '~> 3.7.0' ++ gem 'rspec-rails', '~> 3.7' + gem 'rspec-retry', '~> 0.4.5' + gem 'rspec_profiling', '~> 0.0.5' + gem 'rspec-set', '~> 0.1.3' diff --git a/debian/patches/series b/debian/patches/series index 6a49373b4b..a3c726cff0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -11,6 +11,7 @@ 0430-remove-gitlab-markup.patch 0440-remove-puma.patch 0450-remove-bullet.patch +0460-relax-rspec-rails.patch 0500-set-webpack-root.patch 0510-remove-dev-dependencies.patch 0520-add-system-lib-path-for-webpack.patch