From: Javier Bértoli <jbertoli@curii.com>
Date: Thu, 24 Mar 2022 13:29:13 +0000 (-0300)
Subject: Merge branch '18642-don-t-install-ruby-bundler'
X-Git-Url: https://git.arvados.org/arvados-formula.git/commitdiff_plain/671c067721d046e7a8ec2093500ddf65fb508d58?hp=7151b29626dd663807b5f72e25337c9c21c83680

Merge branch '18642-don-t-install-ruby-bundler'

closes #18642
Arvados-DCO-1.1-Signed-off-by: Javier Bértoli <jbertoli@curii.com>
---

diff --git a/arvados/defaults.yaml b/arvados/defaults.yaml
index 4ac2468..f53af0d 100644
--- a/arvados/defaults.yaml
+++ b/arvados/defaults.yaml
@@ -21,7 +21,6 @@ arvados:
     manage_gems_deps: false
 
     gems_deps:
-      - bundler
       - curl
       - g++
       - gcc
diff --git a/test/integration/api/controls/packages_spec.rb b/test/integration/api/controls/packages_spec.rb
index 1799a4b..1653b58 100644
--- a/test/integration/api/controls/packages_spec.rb
+++ b/test/integration/api/controls/packages_spec.rb
@@ -4,6 +4,17 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+control 'ruby bundler package' do
+  title 'should not be installed'
+
+  describe package('ruby-bundler') do
+    it { should_not be_installed }
+  end
+  describe package('bundler') do
+    it { should_not be_installed }
+  end
+end
+
 control 'arvados api package' do
   title 'should be installed'
 
diff --git a/test/integration/workbench/controls/packages_spec.rb b/test/integration/workbench/controls/packages_spec.rb
index 080a619..97cad19 100644
--- a/test/integration/workbench/controls/packages_spec.rb
+++ b/test/integration/workbench/controls/packages_spec.rb
@@ -1,5 +1,16 @@
 # frozen_string_literal: true
 
+control 'ruby bundler package' do
+  title 'should not be installed'
+
+  describe package('ruby-bundler') do
+    it { should_not be_installed }
+  end
+  describe package('bundler') do
+    it { should_not be_installed }
+  end
+end
+
 control 'arvados workbench package' do
   title 'should be installed'