X-Git-Url: https://git.arvados.org/arvados-formula.git/blobdiff_plain/ad8af2094ca06d93dba1f61f3e96587b12e7f667..1ad296f011443a075b0ac19efc5e260f4ff6f33d:/test/integration/api/controls/packages_spec.rb

diff --git a/test/integration/api/controls/packages_spec.rb b/test/integration/api/controls/packages_spec.rb
index edc2060..969bf07 100644
--- a/test/integration/api/controls/packages_spec.rb
+++ b/test/integration/api/controls/packages_spec.rb
@@ -12,15 +12,7 @@ control 'arvados api package' do
   end
 end
 
-control 'arvados cli gem' do
-  title 'should be installed'
-
-  describe gem('arvados-cli') do
-    it { should be_installed }
-  end
-end
-
-control 'RVM and dependencies' do
+control 'RVM dependencies' do
   title 'should be installed'
 
   only_if("Forced requirement for RedHat's family") do
@@ -40,15 +32,50 @@ control 'RVM and dependencies' do
     pam-devel
     postgresql12-libs
     python3-devel
-    rubygem-bundler
     zlib-devel
   ].each do |p|
     describe package(p) do
       it { should be_installed }
     end
   end
+end
+
+control 'RVM ruby manager' do
+  title 'should be installed'
+
+  only_if('Forced requirement for Centos-7 and Ubuntu-18.04') do
+    (os.redhat? and platform[:release].to_f.truncate == 7) or
+      (os.name == 'ubuntu' and platform[:release].to_f.truncate == 18)
+  end
+
   describe command('/usr/local/rvm/bin/rvm list') do
     its(:exit_status) { should eq 0 }
-    its('stdout') { should match(/ruby-2.5.8/) }
+    its('stdout') { should match(/ruby-2.7.2/) }
+  end
+end
+
+control 'arvados cli gem' do
+  title 'should be installed'
+
+  only_if('Skipped in Centos-7 and Ubuntu-18.04') do
+    !((os.redhat? and platform[:release].to_f.truncate == 7) or
+    (os.name == 'ubuntu' and platform[:release].to_f.truncate == 18))
+  end
+
+  describe gem('arvados-cli') do
+    it { should be_installed }
+  end
+end
+
+control 'RVM arvados cli gem' do
+  title 'should be installed'
+
+  only_if('Forced requirement for Centos-7 and Ubuntu-18.04') do
+    (os.redhat? and platform[:release].to_f.truncate == 7) or
+      (os.name == 'ubuntu' and platform[:release].to_f.truncate == 18)
+  end
+
+  describe gem('arvados-cli', '/usr/local/rvm/bin/rvm all do gem') do
+    it { should be_installed }
   end
 end