clc-cheffish 0.8.clc → 0.8.3.clc
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/chef/provider/chef_data_bag_item.rb +1 -1
- data/lib/chef/provider/chef_mirror.rb +29 -3
- data/lib/chef/resource/chef_mirror.rb +2 -1
- data/lib/cheffish.rb +1 -1
- data/lib/cheffish/chef_provider_base.rb +23 -11
- data/lib/cheffish/recipe_dsl.rb +11 -3
- data/lib/cheffish/version.rb +1 -1
- data/spec/integration/chef_client_spec.rb +1 -1
- data/spec/integration/chef_container_spec.rb +1 -1
- data/spec/integration/chef_group_spec.rb +1 -1
- data/spec/integration/chef_mirror_spec.rb +333 -58
- data/spec/integration/chef_node_spec.rb +658 -56
- data/spec/integration/chef_organization_spec.rb +1 -1
- data/spec/integration/chef_user_spec.rb +1 -1
- data/spec/support/spec_support.rb +6 -0
- metadata +2 -2
|
@@ -5,7 +5,7 @@ require 'chef/provider/chef_organization'
|
|
|
5
5
|
describe Chef::Resource::ChefOrganization do
|
|
6
6
|
extend SpecSupport
|
|
7
7
|
|
|
8
|
-
|
|
8
|
+
when_the_chef_12_server 'is in multi-org mode' do
|
|
9
9
|
context 'and chef_server_url is pointed at the top level' do
|
|
10
10
|
user 'u', {}
|
|
11
11
|
user 'u2', {}
|
|
@@ -44,7 +44,7 @@ describe Chef::Resource::ChefUser do
|
|
|
44
44
|
end
|
|
45
45
|
end
|
|
46
46
|
|
|
47
|
-
|
|
47
|
+
when_the_chef_12_server 'is in multi-org mode' do
|
|
48
48
|
context 'and chef_server_url is pointed at the top level' do
|
|
49
49
|
context 'and we run a recipe that creates user "blah"'do
|
|
50
50
|
with_converge do
|
|
@@ -9,6 +9,12 @@ require 'support/repository_support'
|
|
|
9
9
|
module SpecSupport
|
|
10
10
|
include ChefZero::RSpec
|
|
11
11
|
|
|
12
|
+
def when_the_chef_12_server(*args, &block)
|
|
13
|
+
if Gem::Version.new(ChefZero::VERSION) >= Gem::Version.new('3.1')
|
|
14
|
+
when_the_chef_server(*args, :osc_compat => false, :single_org => false, &block)
|
|
15
|
+
end
|
|
16
|
+
end
|
|
17
|
+
|
|
12
18
|
def self.extended(klass)
|
|
13
19
|
klass.class_eval do
|
|
14
20
|
extend RepositorySupport
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: clc-cheffish
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.8.clc
|
|
4
|
+
version: 0.8.3.clc
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- John Keiser
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2014-
|
|
11
|
+
date: 2014-10-19 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: chef
|