Skip to content

Commit f47c864

Browse files
author
Kevin Paulisse
committed
Fix more tests to use .diff_match? 
1 parent 1c1c507 commit f47c864

1 file changed

Lines changed: 30 additions & 60 deletions

File tree

‎spec/octocatalog-diff/integration/arbitrary_command_line_spec.rb‎

Lines changed: 30 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -24,31 +24,23 @@
2424
end
2525

2626
it 'should contain resource from environments/foo site.pp' do
27-
expect(OctocatalogDiff::Spec.array_contains_partial_array?(
28-
@result.diffs,
29-
['+', "File\f/tmp/environment-foo-site"]
30-
)).to eq(true)
27+
resource = { diff_type: '+', type: 'File', title: '/tmp/environment-foo-site' }
28+
expect(OctocatalogDiff::Spec.diff_match?(@result[:diffs], resource)).to eq(true)
3129
end
3230

3331
it 'should contain resource from environments/foo modules/foo' do
34-
expect(OctocatalogDiff::Spec.array_contains_partial_array?(
35-
@result.diffs,
36-
['+', "File\f/tmp/environment-foo-module"]
37-
)).to eq(true)
32+
resource = { diff_type: '+', type: 'File', title: '/tmp/environment-foo-module' }
33+
expect(OctocatalogDiff::Spec.diff_match?(@result[:diffs], resource)).to eq(true)
3834
end
3935

4036
it 'should not contain resource from environments/production' do
41-
expect(OctocatalogDiff::Spec.array_contains_partial_array?(
42-
@result.diffs,
43-
['+', "File\f/tmp/environment-production-site"]
44-
)).to eq(false)
37+
resource = { diff_type: '+', type: 'File', title: '/tmp/environment-production-site' }
38+
expect(OctocatalogDiff::Spec.diff_match?(@result[:diffs], resource)).to eq(false)
4539
end
4640

4741
it 'should not contain resource from main modules/foo' do
48-
expect(OctocatalogDiff::Spec.array_contains_partial_array?(
49-
@result.diffs,
50-
['+', "File\f/tmp/foo-module"]
51-
)).to eq(false)
42+
resource = { diff_type: '+', type: 'File', title: '/tmp/foo-module' }
43+
expect(OctocatalogDiff::Spec.diff_match?(@result[:diffs], resource)).to eq(false)
5244
end
5345
end
5446

@@ -71,24 +63,18 @@
7163
end
7264

7365
it 'should contain resource from environments/foo site.pp only in to catalog' do
74-
expect(OctocatalogDiff::Spec.array_contains_partial_array?(
75-
@result.diffs,
76-
['+', "File\f/tmp/environment-foo-site"]
77-
)).to eq(true)
66+
resource = { diff_type: '+', type: 'File', title: '/tmp/environment-foo-site' }
67+
expect(OctocatalogDiff::Spec.diff_match?(@result[:diffs], resource)).to eq(true)
7868
end
7969

8070
it 'should contain resource from environments/foo modules/foo only in to catalog' do
81-
expect(OctocatalogDiff::Spec.array_contains_partial_array?(
82-
@result.diffs,
83-
['+', "File\f/tmp/environment-foo-module"]
84-
)).to eq(true)
71+
resource = { diff_type: '+', type: 'File', title: '/tmp/environment-foo-module' }
72+
expect(OctocatalogDiff::Spec.diff_match?(@result[:diffs], resource)).to eq(true)
8573
end
8674

8775
it 'should contain resource from environments/production only in from catalog' do
88-
expect(OctocatalogDiff::Spec.array_contains_partial_array?(
89-
@result.diffs,
90-
['-', "File\f/tmp/environment-production-site"]
91-
)).to eq(true)
76+
resource = { diff_type: '+', type: 'File', title: '/tmp/environment-production-site' }
77+
expect(OctocatalogDiff::Spec.diff_match?(@result[:diffs], resource)).to eq(false)
9278
end
9379
end
9480

@@ -112,31 +98,23 @@
11298
end
11399

114100
it 'should contain resource from environments/foo site.pp' do
115-
expect(OctocatalogDiff::Spec.array_contains_partial_array?(
116-
@result.diffs,
117-
['+', "File\f/tmp/environment-foo-site"]
118-
)).to eq(true)
101+
resource = { diff_type: '+', type: 'File', title: '/tmp/environment-foo-site' }
102+
expect(OctocatalogDiff::Spec.diff_match?(@result[:diffs], resource)).to eq(true)
119103
end
120104

121105
it 'should contain resource from environments/foo modules/foo' do
122-
expect(OctocatalogDiff::Spec.array_contains_partial_array?(
123-
@result.diffs,
124-
['+', "File\f/tmp/environment-foo-module"]
125-
)).to eq(true)
106+
resource = { diff_type: '+', type: 'File', title: '/tmp/environment-foo-module' }
107+
expect(OctocatalogDiff::Spec.diff_match?(@result[:diffs], resource)).to eq(true)
126108
end
127109

128110
it 'should not contain resource from environments/production' do
129-
expect(OctocatalogDiff::Spec.array_contains_partial_array?(
130-
@result.diffs,
131-
['+', "File\f/tmp/environment-production-site"]
132-
)).to eq(false)
111+
resource = { diff_type: '+', type: 'File', title: '/tmp/environment-production-site' }
112+
expect(OctocatalogDiff::Spec.diff_match?(@result[:diffs], resource)).to eq(false)
133113
end
134114

135115
it 'should not contain resource from main modules/foo' do
136-
expect(OctocatalogDiff::Spec.array_contains_partial_array?(
137-
@result.diffs,
138-
['+', "File\f/tmp/foo-module"]
139-
)).to eq(false)
116+
resource = { diff_type: '+', type: 'File', title: '/tmp/foo-module' }
117+
expect(OctocatalogDiff::Spec.diff_match?(@result[:diffs], resource)).to eq(false)
140118
end
141119
end
142120

@@ -160,31 +138,23 @@
160138
end
161139

162140
it 'should contain resource from environments/foo site.pp' do
163-
expect(OctocatalogDiff::Spec.array_contains_partial_array?(
164-
@result.diffs,
165-
['+', "File\f/tmp/environment-foo-site"]
166-
)).to eq(true)
141+
resource = { diff_type: '+', type: 'File', title: '/tmp/environment-foo-site' }
142+
expect(OctocatalogDiff::Spec.diff_match?(@result[:diffs], resource)).to eq(true)
167143
end
168144

169145
it 'should not contain resource from environments/foo modules/foo' do
170-
expect(OctocatalogDiff::Spec.array_contains_partial_array?(
171-
@result.diffs,
172-
['+', "File\f/tmp/environment-foo-module"]
173-
)).to eq(false)
146+
resource = { diff_type: '+', type: 'File', title: '/tmp/environment-foo-module' }
147+
expect(OctocatalogDiff::Spec.diff_match?(@result[:diffs], resource)).to eq(false)
174148
end
175149

176150
it 'should not contain resource from environments/production' do
177-
expect(OctocatalogDiff::Spec.array_contains_partial_array?(
178-
@result.diffs,
179-
['+', "File\f/tmp/environment-production-site"]
180-
)).to eq(false)
151+
resource = { diff_type: '+', type: 'File', title: '/tmp/environment-production-site' }
152+
expect(OctocatalogDiff::Spec.diff_match?(@result[:diffs], resource)).to eq(false)
181153
end
182154

183155
it 'should contain resource from main modules/foo' do
184-
expect(OctocatalogDiff::Spec.array_contains_partial_array?(
185-
@result.diffs,
186-
['+', "File\f/tmp/foo-module"]
187-
)).to eq(true)
156+
resource = { diff_type: '+', type: 'File', title: '/tmp/foo-module' }
157+
expect(OctocatalogDiff::Spec.diff_match?(@result[:diffs], resource)).to eq(true)
188158
end
189159
end
190160
end

0 commit comments

Comments
 (0)