Skip to content

Commit 29be960

Browse files
committed
test: remove legacy facts
1 parent 7c0a44e commit 29be960

File tree

4 files changed

+6
-7
lines changed

4 files changed

+6
-7
lines changed

spec/acceptance/rvm_system_spec.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
# rubocop:disable RSpec/MultipleMemoizedHelpers
66
describe 'rvm' do
77
# host variables
8-
let(:osfamily) { fact('osfamily') }
9-
let(:osname) { fact('operatingsystem') }
10-
let(:osversion) { fact('operatingsystemrelease') }
8+
let(:osfamily) { fact('os.family') }
9+
let(:osname) { fact('os.name') }
10+
let(:osversion) { fact('os.release.major') }
1111

1212
# rvm config
1313
let(:rvm_path) { '/usr/local/rvm/' }
@@ -70,7 +70,7 @@
7070
# baseline manifest
7171
let(:manifest) do
7272
<<-EOS
73-
if $::osfamily == 'RedHat' {
73+
if $facts['os']['familiy'] == 'RedHat' {
7474
class { 'epel':
7575
before => Class['rvm'],
7676
}

spec/classes/dependencies_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
it { is_expected.to compile.with_all_deps }
1313

14-
case os_facts[:osfamily]
14+
case os_facts[:os]['family']
1515
when 'RedHat'
1616
it { is_expected.to contain_package('which') }
1717
it { is_expected.to contain_package('gcc') }

spec/classes/system_spec.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
{
99
rvm_version: '1.10.0',
1010
root_home: '/root',
11-
osfamily: 'Debian',
1211
os: {
1312
family: 'Debian'
1413
}

spec/defines/system_user_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
it { is_expected.to contain_user(username) }
1717
it { is_expected.to contain_group(group) }
1818

19-
case os_facts[:osfamily]
19+
case os_facts[:os]['family']
2020
when 'FreeBSD'
2121
it { is_expected.to contain_exec("rvm-system-user-#{username}").with_command("/usr/sbin/pw groupmod #{group} -m #{username}") }
2222
when 'Darwin'

0 commit comments

Comments
 (0)