obey new rubocop rules
This commit is contained in:
Родитель
af45601d7a
Коммит
92b864a2f8
|
@ -107,13 +107,13 @@ if node['platform_version'].match?(/10\.13/) || node['platform_version'].match?(
|
|||
end
|
||||
|
||||
xcode '9.2' do
|
||||
ios_simulators %w(11 10)
|
||||
ios_simulators ['11', '10']
|
||||
end
|
||||
|
||||
elsif node['platform_version'].match?(/10\.11/)
|
||||
|
||||
xcode '8.2.1' do
|
||||
ios_simulators %w(10 9)
|
||||
ios_simulators ['10', '9']
|
||||
end
|
||||
end
|
||||
```
|
||||
|
@ -122,7 +122,7 @@ end
|
|||
|
||||
```ruby
|
||||
xcode '9.2' do
|
||||
ios_simulators %w(11 10)
|
||||
ios_simulators ['11', '10']
|
||||
download_url 'file:///Users/johnny/Desktop/xcode_install.dmg'
|
||||
end
|
||||
```
|
||||
|
|
|
@ -9,12 +9,12 @@ module MacOS
|
|||
|
||||
def desktop?
|
||||
return false if @machine_model.nil?
|
||||
@machine_model.match? Regexp.union %w(Macmini MacPro iMac)
|
||||
@machine_model.match? Regexp.union ['Macmini', 'MacPro', 'iMac']
|
||||
end
|
||||
|
||||
def portable?
|
||||
return false if @machine_model.nil?
|
||||
@machine_model.match? Regexp.union %w(MacBook)
|
||||
@machine_model.match? Regexp.union ['MacBook']
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
unified_mode true
|
||||
|
||||
provides :xcode
|
||||
default_action %i(install_gem install_xcode install_simulators)
|
||||
default_action [:install_gem, :install_xcode, :install_simulators]
|
||||
|
||||
property :version, String, name_property: true
|
||||
property :path, String, default: '/Applications/Xcode.app'
|
||||
|
|
|
@ -103,7 +103,7 @@ describe MacOS::PlistHelpers, '#type_to_commandline_string' do
|
|||
end
|
||||
|
||||
it 'returns the required array entry type as a string' do
|
||||
expect(type_to_commandline_string(%w(foo bar))).to eq 'array'
|
||||
expect(type_to_commandline_string(['foo', 'bar'])).to eq 'array'
|
||||
end
|
||||
|
||||
it 'returns the required dictionary entry type as a string' do
|
||||
|
|
|
@ -10,7 +10,7 @@ macos_user 'create non-admin user with groups' do
|
|||
username 'johnny'
|
||||
fullname 'Johnny Appleseed'
|
||||
password 'yang-yolked-cordon-karate'
|
||||
groups %w(alpha beta)
|
||||
groups ['alpha', 'beta']
|
||||
end
|
||||
|
||||
macos_user 'create non-admin without groups' do
|
||||
|
|
|
@ -2,6 +2,6 @@ if node['platform_version'] >= '10.15.2'
|
|||
xcode '11.5'
|
||||
else
|
||||
xcode '9.4.1' do
|
||||
ios_simulators %w(11 10)
|
||||
ios_simulators ['11', '10']
|
||||
end
|
||||
end
|
||||
|
|
Загрузка…
Ссылка в новой задаче