|
1 | 1 | require 'spec_helper'
|
2 | 2 | require 'puppet/environments'
|
3 | 3 | require 'puppet/file_system'
|
4 |
| -require 'matchers/include' |
5 |
| -require 'matchers/include_in_order' |
6 | 4 |
|
7 | 5 | module PuppetEnvironments
|
8 | 6 | describe Puppet::Environments do
|
9 |
| - include Matchers::Include |
10 |
| - |
11 | 7 | FS = Puppet::FileSystem
|
12 | 8 |
|
13 | 9 | before(:each) do
|
@@ -49,7 +45,7 @@ module PuppetEnvironments
|
49 | 45 | loader_from(:filesystem => [directory_tree, global_path_1, global_path_2],
|
50 | 46 | :directory => directory_tree.children.first,
|
51 | 47 | :modulepath => [global_path_1_location, global_path_2_location]) do |loader|
|
52 |
| - expect(loader.list).to include_in_any_order( |
| 48 | + expect(loader.list).to contain_exactly( |
53 | 49 | environment(:an_environment).
|
54 | 50 | with_manifest("#{FS.path_string(directory_tree)}/envdir/an_environment/manifests").
|
55 | 51 | with_modulepath(["#{FS.path_string(directory_tree)}/envdir/an_environment/modules",
|
@@ -87,7 +83,7 @@ module PuppetEnvironments
|
87 | 83 |
|
88 | 84 | loader_from(:filesystem => [envdir],
|
89 | 85 | :directory => envdir) do |loader|
|
90 |
| - expect(loader.list).to include_in_any_order(environment(:env1), environment(:env2)) |
| 86 | + expect(loader.list).to contain_exactly(environment(:env1), environment(:env2)) |
91 | 87 | end
|
92 | 88 | end
|
93 | 89 |
|
@@ -559,7 +555,7 @@ module PuppetEnvironments
|
559 | 555 | describe "cached loaders" do
|
560 | 556 | it "lists environments" do
|
561 | 557 | loader_from(:filesystem => [directory_tree], :directory => directory_tree.children.first) do |loader|
|
562 |
| - expect(Puppet::Environments::Cached.new(loader).list).to include_in_any_order( |
| 558 | + expect(Puppet::Environments::Cached.new(loader).list).to contain_exactly( |
563 | 559 | environment(:an_environment),
|
564 | 560 | environment(:another_environment),
|
565 | 561 | environment(:symlinked_environment))
|
|
0 commit comments