chef 15.7.30 → 15.7.31

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 21a65c380c16265bc74c76cb525f691c84c26327e067a6149805219a6424c793
4
- data.tar.gz: a0b987c14a4f944998856755ce3c29079437537656a23677c990354d4f412ad9
3
+ metadata.gz: 9738163041b95edf75281064715ff14a4cfea12319d127190eb5cb7d13a3e83e
4
+ data.tar.gz: 172082bd04e074990f689e14c90dd487597c4199ddaba6e398dff2fab5acb257
5
5
  SHA512:
6
- metadata.gz: 5dd7d0407f6ab4162bb06dba39338ff1559a124eed0254e7621e727bcf20793e4c4ba024e56b111d1ffdacaf7df70d1c05e66668d270ab46f0aca0eb6f0d2e01
7
- data.tar.gz: 90d03863587712d956ae1f1115f5f1d0d3ea09ef9f52c0f4c1adfd7820c75869428edf8cf614babd6b02f46a39a0d56d6baaa7ad5d8a8bcd8640bcd4252313dd
6
+ metadata.gz: 445f03e0685732c82e8a613f7e577fcfed29df04c885ba665a931b1029fb2c1deef6405a63f8733ad3d47c0fa37a6afb92e6ee7de4bd04923fc9de714a925cd2
7
+ data.tar.gz: 6a1ea9a187c85f0f956663a43988c450cf59a8a2f72a19bf780840fef30f58cb2bb2e8262e7d3b848560c62c32e0124efb3c5666c8fdaf472bec7d9adadee3f5
@@ -66,7 +66,7 @@ class Chef
66
66
 
67
67
  # Instantiate a proxy loader using the temporary symlink
68
68
  proxy_loader = Chef::Cookbook::CookbookVersionLoader.new(proxy_cookbook_path, other.chefignore)
69
- proxy_loader.load_cookbooks
69
+ proxy_loader.load!
70
70
 
71
71
  cookbook_to_upload = proxy_loader.cookbook_version
72
72
  cookbook_to_upload.identifier = identifier
@@ -72,7 +72,7 @@ class Chef
72
72
 
73
73
  # Instantiate a proxy loader using the temporary symlink
74
74
  proxy_loader = Chef::Cookbook::CookbookVersionLoader.new(proxy_cookbook_path, other.chefignore)
75
- proxy_loader.load_cookbooks
75
+ proxy_loader.load!
76
76
 
77
77
  cookbook_to_upload = proxy_loader.cookbook_version
78
78
  cookbook_to_upload.freeze_version if options[:freeze]
@@ -29,7 +29,7 @@ class Chef
29
29
  cookbook_name, _dash, identifier = name.rpartition("-")
30
30
  # KLUDGE: We shouldn't have to use instance_variable_set
31
31
  loader.instance_variable_set(:@cookbook_name, cookbook_name)
32
- loader.load_cookbooks
32
+ loader.load!
33
33
  cookbook_version = loader.cookbook_version
34
34
  cookbook_version.identifier = identifier
35
35
  cookbook_version
@@ -143,7 +143,7 @@ class Chef
143
143
 
144
144
  def cookbook_version
145
145
  loader = Chef::Cookbook::CookbookVersionLoader.new(file_path, chefignore)
146
- loader.load_cookbooks
146
+ loader.load!
147
147
  loader.cookbook_version
148
148
  end
149
149
  end
@@ -33,7 +33,7 @@ class Chef
33
33
 
34
34
  # KLUDGE: We shouldn't have to use instance_variable_set
35
35
  loader.instance_variable_set(:@cookbook_name, canonical_name)
36
- loader.load_cookbooks
36
+ loader.load!
37
37
  loader.cookbook_version
38
38
  end
39
39
  end
@@ -82,7 +82,7 @@ class Chef
82
82
  end
83
83
 
84
84
  def load
85
- Chef::Log.warn "load method is deprecated. Use load! instead"
85
+ Chef::Log.warn "Chef::Cookbook::CookbookVersionLoader's load method is deprecated. Please use load! instead."
86
86
  metadata # force lazy evaluation to occur
87
87
 
88
88
  # re-raise any exception that occurred when reading the metadata
@@ -23,7 +23,7 @@ require_relative "version_string"
23
23
 
24
24
  class Chef
25
25
  CHEF_ROOT = File.expand_path("../..", __FILE__)
26
- VERSION = Chef::VersionString.new("15.7.30")
26
+ VERSION = Chef::VersionString.new("15.7.31")
27
27
  end
28
28
 
29
29
  #
File without changes
@@ -54,7 +54,6 @@ describe "ChefFSDataStore tests", :workstation do
54
54
 
55
55
  context "GET /TYPE" do
56
56
  it "knife list -z -R returns everything" do
57
- expect(Chef::Log).to receive(:warn).with(/load method is deprecated. Use load! instead/).twice
58
57
  knife("list -z -Rfp /").should_succeed <<~EOM
59
58
  /acls/
60
59
  /acls/clients/
@@ -119,7 +118,6 @@ describe "ChefFSDataStore tests", :workstation do
119
118
  end
120
119
 
121
120
  it "knife delete -z -r /cookbooks/x works" do
122
- expect(Chef::Log).to receive(:warn).with(/load method is deprecated. Use load! instead/).at_least(3).times
123
121
  knife("delete -z -r /cookbooks/x").should_succeed "Deleted /cookbooks/x\n"
124
122
  knife("list -z -Rfp /cookbooks").should_succeed ""
125
123
  end
@@ -157,7 +155,6 @@ describe "ChefFSDataStore tests", :workstation do
157
155
  end
158
156
 
159
157
  it "knife show -z /cookbooks/x/metadata.rb works" do
160
- expect(Chef::Log).to receive(:warn).with(/load method is deprecated. Use load! instead/).once
161
158
  knife("show -z /cookbooks/x/metadata.rb").should_succeed "/cookbooks/x/metadata.rb:\n#{cookbook_x_100_metadata_rb}\n"
162
159
  end
163
160
 
@@ -193,7 +190,6 @@ describe "ChefFSDataStore tests", :workstation do
193
190
  end
194
191
 
195
192
  it "knife cookbook upload works" do
196
- expect(Chef::Log).to receive(:warn).with(/load method is deprecated. Use load! instead/).once
197
193
  knife("cookbook upload -z --cookbook-path #{path_to("cookbooks_to_upload")} x").should_succeed stderr: <<~EOM
198
194
  Uploading x [1.0.0]
199
195
  Uploaded 1 cookbook.
@@ -446,7 +442,6 @@ describe "ChefFSDataStore tests", :workstation do
446
442
 
447
443
  context "GET /TYPE" do
448
444
  it "knife list -z -R returns everything" do
449
- expect(Chef::Log).to receive(:warn).with(/load method is deprecated. Use load! instead/).once
450
445
  knife("list -z -Rfp /").should_succeed <<~EOM
451
446
  /clients/
452
447
  /clients/x.json
@@ -41,7 +41,6 @@ describe "knife deps", :workstation do
41
41
  file "cookbooks/soup/recipes/chicken.rb", ""
42
42
  end
43
43
  it "knife deps reports all dependencies" do
44
- expect(Chef::Log).to receive(:warn).with(/load method is deprecated. Use load! instead/).twice
45
44
  knife("deps /roles/starring.json").should_succeed <<~EOM
46
45
  /roles/minor.json
47
46
  /cookbooks/quiche
@@ -61,7 +60,6 @@ describe "knife deps", :workstation do
61
60
  file "cookbooks/soup/recipes/chicken.rb", ""
62
61
  end
63
62
  it "knife deps reports all dependencies" do
64
- expect(Chef::Log).to receive(:warn).with(/load method is deprecated. Use load! instead/).twice
65
63
  knife("deps /roles/starring.json").should_succeed <<~EOM
66
64
  /roles/minor.json
67
65
  /cookbooks/quiche
@@ -96,7 +94,6 @@ describe "knife deps", :workstation do
96
94
  file "nodes/mort.json", { "run_list" => %w{role[minor] recipe[quiche] recipe[soup::chicken]} }
97
95
  end
98
96
  it "knife deps reports just the node" do
99
- expect(Chef::Log).to receive(:warn).with(/load method is deprecated. Use load! instead/).twice
100
97
  knife("deps /nodes/mort.json").should_succeed <<~EOM
101
98
  /roles/minor.json
102
99
  /cookbooks/quiche
@@ -111,7 +108,6 @@ describe "knife deps", :workstation do
111
108
  file "cookbooks/quiche/recipes/default.rb", ""
112
109
  end
113
110
  it "knife deps reports just the cookbook" do
114
- expect(Chef::Log).to receive(:warn).with(/load method is deprecated. Use load! instead/).once
115
111
  knife("deps /cookbooks/quiche").should_succeed "/cookbooks/quiche\n"
116
112
  end
117
113
  end
@@ -123,7 +119,6 @@ depends "kettle"'
123
119
  file "cookbooks/quiche/recipes/default.rb", ""
124
120
  end
125
121
  it "knife deps reports just the cookbook" do
126
- expect(Chef::Log).to receive(:warn).with(/load method is deprecated. Use load! instead/).twice
127
122
  knife("deps /cookbooks/quiche").should_succeed "/cookbooks/kettle\n/cookbooks/quiche\n"
128
123
  end
129
124
  end
@@ -153,7 +148,6 @@ depends "kettle"'
153
148
  end
154
149
 
155
150
  it "knife deps reports all dependencies" do
156
- expect(Chef::Log).to receive(:warn).with(/load method is deprecated. Use load! instead/).twice
157
151
  knife("deps /nodes/mort.json").should_succeed <<~EOM
158
152
  /environments/desert.json
159
153
  /roles/minor.json
@@ -164,7 +158,6 @@ depends "kettle"'
164
158
  EOM
165
159
  end
166
160
  it "knife deps * reports all dependencies of all things" do
167
- expect(Chef::Log).to receive(:warn).with(/load method is deprecated. Use load! instead/).twice
168
161
  knife("deps /nodes/*").should_succeed <<~EOM
169
162
  /roles/minor.json
170
163
  /nodes/bart.json
@@ -176,7 +169,6 @@ depends "kettle"'
176
169
  EOM
177
170
  end
178
171
  it "knife deps a b reports all dependencies of a and b" do
179
- expect(Chef::Log).to receive(:warn).with(/load method is deprecated. Use load! instead/).twice
180
172
  knife("deps /nodes/bart.json /nodes/mort.json").should_succeed <<~EOM
181
173
  /roles/minor.json
182
174
  /nodes/bart.json
@@ -188,7 +180,6 @@ depends "kettle"'
188
180
  EOM
189
181
  end
190
182
  it "knife deps --tree /* shows dependencies in a tree" do
191
- expect(Chef::Log).to receive(:warn).with(/load method is deprecated. Use load! instead/).twice
192
183
  knife("deps --tree /nodes/*").should_succeed <<~EOM
193
184
  /nodes/bart.json
194
185
  /roles/minor.json
@@ -223,13 +214,11 @@ depends "foo"'
223
214
  end
224
215
 
225
216
  it "knife deps prints each once" do
226
- expect(Chef::Log).to receive(:warn).with(/load method is deprecated. Use load! instead/).at_least(3).times
227
217
  knife("deps /cookbooks/foo").should_succeed(
228
218
  stdout: "/cookbooks/baz\n/cookbooks/bar\n/cookbooks/foo\n"
229
219
  )
230
220
  end
231
221
  it "knife deps --tree prints each once" do
232
- expect(Chef::Log).to receive(:warn).with(/load method is deprecated. Use load! instead/).at_least(3).times
233
222
  knife("deps --tree /cookbooks/foo").should_succeed(
234
223
  stdout: "/cookbooks/foo\n /cookbooks/bar\n /cookbooks/baz\n /cookbooks/foo\n"
235
224
  )
@@ -178,7 +178,7 @@ describe "knife upload", :workstation do
178
178
  file "cookbooks/x/metadata.rb", "name 'x'; version '1.0.0'; depends 'x'"
179
179
  end
180
180
 
181
- it "should fail in Chef 13" do
181
+ it "fails with RuntimeError" do
182
182
  expect { knife("upload /cookbooks") }.to raise_error RuntimeError, /Cookbook depends on itself/
183
183
  end
184
184
  end
@@ -197,7 +197,6 @@ describe "knife upload", :workstation do
197
197
  end
198
198
 
199
199
  it "knife upload adds the new files" do
200
- expect(Chef::Log).to receive(:warn).with(/load method is deprecated. Use load! instead/).at_least(2).times
201
200
  knife("upload /").should_succeed <<~EOM
202
201
  Created /clients/y.json
203
202
  Updated /cookbooks/x
@@ -217,7 +216,6 @@ describe "knife upload", :workstation do
217
216
  end
218
217
 
219
218
  it "knife upload --no-diff adds the new files" do
220
- expect(Chef::Log).to receive(:warn).with(/load method is deprecated. Use load! instead/).at_least(2).times
221
219
  knife("upload --no-diff /").should_succeed <<~EOM
222
220
  Created /clients/y.json
223
221
  Updated /cookbooks/x
@@ -494,7 +492,6 @@ describe "knife upload", :workstation do
494
492
  # technically we shouldn't have deleted missing files. But ... cookbooks
495
493
  # are a special case.
496
494
  it "knife upload of the cookbook itself succeeds" do
497
- expect(Chef::Log).to receive(:warn).with(/load method is deprecated. Use load! instead/).at_least(2).times
498
495
  knife("upload /cookbooks/x").should_succeed <<~EOM
499
496
  Updated /cookbooks/x
500
497
  EOM
@@ -504,7 +501,6 @@ describe "knife upload", :workstation do
504
501
  end
505
502
 
506
503
  it "knife upload --purge of the cookbook itself succeeds" do
507
- expect(Chef::Log).to receive(:warn).with(/load method is deprecated. Use load! instead/).at_least(2).times
508
504
  knife("upload /cookbooks/x").should_succeed <<~EOM
509
505
  Updated /cookbooks/x
510
506
  EOM
@@ -520,7 +516,6 @@ describe "knife upload", :workstation do
520
516
  end
521
517
 
522
518
  it "knife upload of the cookbook succeeds" do
523
- expect(Chef::Log).to receive(:warn).with(/load method is deprecated. Use load! instead/).at_least(2).times
524
519
  knife("upload /cookbooks/x").should_succeed <<~EOM
525
520
  Updated /cookbooks/x
526
521
  EOM
@@ -538,7 +533,6 @@ describe "knife upload", :workstation do
538
533
  end
539
534
 
540
535
  it "knife upload of the cookbook succeeds" do
541
- expect(Chef::Log).to receive(:warn).with(/load method is deprecated. Use load! instead/).at_least(2).times
542
536
  knife("upload /cookbooks/x").should_succeed <<~EOM
543
537
  Updated /cookbooks/x
544
538
  EOM
@@ -554,7 +548,6 @@ describe "knife upload", :workstation do
554
548
  end
555
549
 
556
550
  it "knife upload --freeze freezes the cookbook" do
557
- expect(Chef::Log).to receive(:warn).with(/load method is deprecated. Use load! instead/).at_least(2).times
558
551
  knife("upload --freeze /cookbooks/x").should_succeed <<~EOM
559
552
  Updated /cookbooks/x
560
553
  EOM
@@ -577,11 +570,9 @@ describe "knife upload", :workstation do
577
570
  end
578
571
 
579
572
  it "knife upload fails to upload the frozen cookbook" do
580
- expect(Chef::Log).to receive(:warn).with(/load method is deprecated. Use load! instead/).at_least(2).times
581
573
  knife("upload /cookbooks/frozencook").should_fail "ERROR: /cookbooks failed to write: Cookbook frozencook is frozen\n"
582
574
  end
583
575
  it "knife upload --force uploads the frozen cookbook" do
584
- expect(Chef::Log).to receive(:warn).with(/load method is deprecated. Use load! instead/).at_least(2).times
585
576
  knife("upload --force /cookbooks/frozencook").should_succeed <<~EOM
586
577
  Updated /cookbooks/frozencook
587
578
  EOM
@@ -603,7 +594,6 @@ describe "knife upload", :workstation do
603
594
  end
604
595
 
605
596
  it "knife upload /cookbooks/x uploads the local version" do
606
- expect(Chef::Log).to receive(:warn).with(/load method is deprecated. Use load! instead/).at_least(2).times
607
597
  knife("diff --name-status /cookbooks").should_succeed <<~EOM
608
598
  M\t/cookbooks/x/metadata.rb
609
599
  D\t/cookbooks/x/onlyin1.0.1.rb
@@ -641,7 +631,6 @@ describe "knife upload", :workstation do
641
631
  D\t/cookbooks/x/onlyin1.0.1.rb
642
632
  A\t/cookbooks/x/onlyin1.0.0.rb
643
633
  EOM
644
- expect(Chef::Log).to receive(:warn).with(/load method is deprecated. Use load! instead/).at_least(2).times
645
634
  knife("upload --purge /cookbooks/x").should_succeed <<~EOM
646
635
  Updated /cookbooks/x
647
636
  EOM
@@ -660,7 +649,6 @@ describe "knife upload", :workstation do
660
649
  end
661
650
 
662
651
  it "knife upload /cookbooks/x uploads the local version generates metadata.json and uploads it." do
663
- expect(Chef::Log).to receive(:warn).with(/load method is deprecated. Use load! instead/).at_least(2).times
664
652
  knife("upload --purge /cookbooks/x").should_succeed <<~EOM
665
653
  Updated /cookbooks/x
666
654
  EOM
@@ -676,7 +664,6 @@ describe "knife upload", :workstation do
676
664
  end
677
665
 
678
666
  it "knife upload /cookbooks/x uploads the local version and generates metadata.json before upload and uploads it." do
679
- expect(Chef::Log).to receive(:warn).with(/load method is deprecated. Use load! instead/).at_least(2).times
680
667
  knife("diff --name-status /cookbooks").should_succeed <<~EOM
681
668
  M\t/cookbooks/x/metadata.rb
682
669
  D\t/cookbooks/x/onlyin1.0.1.rb
@@ -699,7 +686,6 @@ describe "knife upload", :workstation do
699
686
  end
700
687
 
701
688
  it "knife upload /cookbooks/x uploads the new version" do
702
- expect(Chef::Log).to receive(:warn).with(/load method is deprecated. Use load! instead/).at_least(2).times
703
689
  knife("upload --purge /cookbooks/x").should_succeed <<~EOM
704
690
  Updated /cookbooks/x
705
691
  EOM
@@ -802,7 +788,6 @@ describe "knife upload", :workstation do
802
788
  file "cookbooks/x/metadata.rb", cb_metadata("x", "1.0.0", "\nchef_version '~> 999.0'")
803
789
  end
804
790
  it "knife upload succeeds" do
805
- expect(Chef::Log).to receive(:warn).with(/load method is deprecated. Use load! instead/).at_least(2).times
806
791
  knife("upload /cookbooks/x").should_succeed <<~EOM
807
792
  Created /cookbooks/x
808
793
  EOM
@@ -953,7 +938,6 @@ describe "knife upload", :workstation do
953
938
  end
954
939
 
955
940
  it "knife upload adds the new files" do
956
- expect(Chef::Log).to receive(:warn).with(/load method is deprecated. Use load! instead/).at_least(3).times
957
941
  knife("upload /").should_succeed <<~EOM
958
942
  Created /clients/y.json
959
943
  Updated /cookbooks/x-1.0.0
@@ -1160,7 +1144,6 @@ describe "knife upload", :workstation do
1160
1144
  # technically we shouldn't have deleted missing files. But ... cookbooks
1161
1145
  # are a special case.
1162
1146
  it "knife upload of the cookbook itself succeeds" do
1163
- expect(Chef::Log).to receive(:warn).with(/load method is deprecated. Use load! instead/).once
1164
1147
  knife("upload /cookbooks/x-1.0.0").should_succeed <<~EOM
1165
1148
  Updated /cookbooks/x-1.0.0
1166
1149
  EOM
@@ -1168,7 +1151,6 @@ describe "knife upload", :workstation do
1168
1151
  end
1169
1152
 
1170
1153
  it "knife upload --purge of the cookbook itself succeeds" do
1171
- expect(Chef::Log).to receive(:warn).with(/load method is deprecated. Use load! instead/).once
1172
1154
  knife("upload /cookbooks/x-1.0.0").should_succeed <<~EOM
1173
1155
  Updated /cookbooks/x-1.0.0
1174
1156
  EOM
@@ -1182,7 +1164,6 @@ describe "knife upload", :workstation do
1182
1164
  end
1183
1165
 
1184
1166
  it "knife upload of the cookbook succeeds" do
1185
- expect(Chef::Log).to receive(:warn).with(/load method is deprecated. Use load! instead/).once
1186
1167
  knife("upload /cookbooks/x-1.0.0").should_succeed <<~EOM
1187
1168
  Updated /cookbooks/x-1.0.0
1188
1169
  EOM
@@ -1198,7 +1179,6 @@ describe "knife upload", :workstation do
1198
1179
  end
1199
1180
 
1200
1181
  it "knife upload of the cookbook succeeds" do
1201
- expect(Chef::Log).to receive(:warn).with(/load method is deprecated. Use load! instead/).once
1202
1182
  knife("upload /cookbooks/x-1.0.0").should_succeed <<~EOM
1203
1183
  Updated /cookbooks/x-1.0.0
1204
1184
  EOM
@@ -1220,7 +1200,6 @@ describe "knife upload", :workstation do
1220
1200
  end
1221
1201
 
1222
1202
  it "knife upload /cookbooks uploads the local version" do
1223
- expect(Chef::Log).to receive(:warn).with(/load method is deprecated. Use load! instead/).once
1224
1203
  knife("diff --name-status /cookbooks").should_succeed <<~EOM
1225
1204
  M\t/cookbooks/x-1.0.0/onlyin1.0.0.rb
1226
1205
  D\t/cookbooks/x-1.0.1
@@ -1239,7 +1218,6 @@ describe "knife upload", :workstation do
1239
1218
  cookbook "x", "0.9.9", { "onlyin0.9.9.rb" => "hi" }
1240
1219
  end
1241
1220
  it "knife upload /cookbooks uploads the local version" do
1242
- expect(Chef::Log).to receive(:warn).with(/load method is deprecated. Use load! instead/).once
1243
1221
  knife("upload --purge /cookbooks").should_succeed <<~EOM
1244
1222
  Updated /cookbooks/x-1.0.0
1245
1223
  Deleted extra entry /cookbooks/x-0.9.9 (purge is on)
@@ -1254,7 +1232,6 @@ describe "knife upload", :workstation do
1254
1232
  end
1255
1233
 
1256
1234
  it "knife upload /cookbooks/x uploads the local version" do
1257
- expect(Chef::Log).to receive(:warn).with(/load method is deprecated. Use load! instead/).once
1258
1235
  knife("diff --name-status /cookbooks").should_succeed <<~EOM
1259
1236
  D\t/cookbooks/x-1.0.1
1260
1237
  A\t/cookbooks/x-1.0.0
@@ -1273,7 +1250,6 @@ describe "knife upload", :workstation do
1273
1250
  end
1274
1251
 
1275
1252
  it "knife upload /cookbooks/x uploads the new version" do
1276
- expect(Chef::Log).to receive(:warn).with(/load method is deprecated. Use load! instead/).once
1277
1253
  knife("upload --purge /cookbooks").should_succeed <<~EOM
1278
1254
  Created /cookbooks/x-1.0.0
1279
1255
  Deleted extra entry /cookbooks/x-0.9.9 (purge is on)
@@ -1348,7 +1324,6 @@ describe "knife upload", :workstation do
1348
1324
  file "cookbooks/x-1.0.0/metadata.rb", cb_metadata("x", "1.0.0", "\nchef_version '~> 999.0'")
1349
1325
  end
1350
1326
  it "knife upload succeeds" do
1351
- expect(Chef::Log).to receive(:warn).with(/load method is deprecated. Use load! instead/).once
1352
1327
  knife("upload /cookbooks/x-1.0.0").should_succeed <<~EOM
1353
1328
  Created /cookbooks/x-1.0.0
1354
1329
  EOM
@@ -1412,7 +1387,6 @@ describe "knife upload", :workstation do
1412
1387
  end
1413
1388
 
1414
1389
  it "knife upload / uploads everything" do
1415
- expect(Chef::Log).to receive(:warn).with(/load method is deprecated. Use load! instead/).at_least(2).times
1416
1390
  knife("upload /").should_succeed <<~EOM
1417
1391
  Updated /acls/groups/blah.json
1418
1392
  Created /clients/x.json
@@ -1520,7 +1494,6 @@ describe "knife upload", :workstation do
1520
1494
  end
1521
1495
 
1522
1496
  it "knife upload updates everything" do
1523
- expect(Chef::Log).to receive(:warn).with(/load method is deprecated. Use load! instead/).at_least(2).times
1524
1497
  knife("upload /").should_succeed <<~EOM
1525
1498
  Updated /acls/groups/blah.json
1526
1499
  Updated /clients/x.json
@@ -125,7 +125,6 @@ describe Chef::Cookbook::CookbookVersionLoader do
125
125
  end
126
126
 
127
127
  it "gives deprecation warning called with #load and raise error for Cookbook not found" do
128
- expect(Chef::Log).to receive(:warn).with(/load method is deprecated. Use load! instead/)
129
128
  expect { cookbook_loader.load }.to raise_error(Chef::Exceptions::CookbookNotFoundInRepo)
130
129
  end
131
130
 
@@ -150,7 +149,6 @@ describe Chef::Cookbook::CookbookVersionLoader do
150
149
  end
151
150
 
152
151
  it "gives deprecation warning to us load! when called with #load and raises error" do
153
- expect(Chef::Log).to receive(:warn).with(/load method is deprecated. Use load! instead/)
154
152
  expect { cookbook_loader.load }.to raise_error("THIS METADATA HAS A BUG")
155
153
  end
156
154
 
@@ -183,7 +181,6 @@ describe Chef::Cookbook::CookbookVersionLoader do
183
181
  end
184
182
 
185
183
  it "gives deprecation warning to use load! method when called with #load and raises error for invalid metadata" do
186
- expect(Chef::Log).to receive(:warn).with(/load method is deprecated. Use load! instead/)
187
184
  expect { cookbook_loader.load }.to raise_error(Chef::Exceptions::MetadataNotValid, error_message)
188
185
  end
189
186
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: chef
3
3
  version: !ruby/object:Gem::Version
4
- version: 15.7.30
4
+ version: 15.7.31
5
5
  platform: ruby
6
6
  authors:
7
7
  - Adam Jacob
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-01-23 00:00:00.000000000 Z
11
+ date: 2020-01-24 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: chef-config
@@ -16,28 +16,28 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 15.7.30
19
+ version: 15.7.31
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - '='
25
25
  - !ruby/object:Gem::Version
26
- version: 15.7.30
26
+ version: 15.7.31
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: chef-utils
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - '='
32
32
  - !ruby/object:Gem::Version
33
- version: 15.7.30
33
+ version: 15.7.31
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - '='
39
39
  - !ruby/object:Gem::Version
40
- version: 15.7.30
40
+ version: 15.7.31
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: train-core
43
43
  requirement: !ruby/object:Gem::Requirement