Update for consistent data structures

Author: kpaulisse

spec/octocatalog-diff/tests/catalog-diff/filter/single_item_array_spec.rb

@@ -25,9 +25,9 @@
     it 'should filter when from-catalog has string and to-catalog has array with that string' do
       diff = [
         '~',
-        "File\ffoobar.json",
-        { 'parameters' => { 'notify' => 'Service[foo]' } },
-        { 'parameters' => { 'notify' => ['Service[foo]'] } }
+        "File\ffoobar.json\fparameters\fnotify",
+        'Service[foo]',
+        ['Service[foo]']
       ]
       diff_obj = OctocatalogDiff::API::V1::Diff.new(diff)
       result = subject.filtered?(diff_obj)
@@ -37,9 +37,9 @@
     it 'should filter when to-catalog has string and from-catalog has array with that string' do
       diff = [
         '~',
-        "File\ffoobar.json",
-        { 'parameters' => { 'notify' => ['Service[foo]'] } },
-        { 'parameters' => { 'notify' => 'Service[foo]' } }
+        "File\ffoobar.json\fparameters\fnotify",
+        ['Service[foo]'],
+        'Service[foo]'
       ]
       diff_obj = OctocatalogDiff::API::V1::Diff.new(diff)
       result = subject.filtered?(diff_obj)
@@ -49,9 +49,9 @@
     it 'should not filter when from-catalog has string and to-catalog has array with a different string' do
       diff = [
         '~',
-        "File\ffoobar.json",
-        { 'parameters' => { 'notify' => 'Service[bar]' } },
-        { 'parameters' => { 'notify' => ['Service[foo]'] } }
+        "File\ffoobar.json\fparameters\fnotify",
+        'Service[bar]',
+        ['Service[foo]']
       ]
       diff_obj = OctocatalogDiff::API::V1::Diff.new(diff)
       result = subject.filtered?(diff_obj)
@@ -61,9 +61,9 @@
     it 'should not filter when to-catalog has string and from-catalog has array with a different string' do
       diff = [
         '~',
-        "File\ffoobar.json",
-        { 'parameters' => { 'notify' => ['Service[foo]'] } },
-        { 'parameters' => { 'notify' => 'Service[bar]' } }
+        "File\ffoobar.json\fparameters\fnotify",
+        ['Service[foo]'],
+        'Service[bar]'
       ]
       diff_obj = OctocatalogDiff::API::V1::Diff.new(diff)
       result = subject.filtered?(diff_obj)
@@ -73,9 +73,9 @@
     it 'should not filter when both of the items are arrays' do
       diff = [
         '~',
-        "File\ffoobar.json",
-        { 'parameters' => { 'notify' => ['Service[bar]'] } },
-        { 'parameters' => { 'notify' => ['Service[foo]'] } }
+        "File\ffoobar.json\fparameters\fnotify",
+        ['Service[foo]'],
+        ['Service[bar]']
       ]
       diff_obj = OctocatalogDiff::API::V1::Diff.new(diff)
       result = subject.filtered?(diff_obj)
@@ -86,9 +86,9 @@
       # This diff should never be produced by the program, but catch the edge case anyway.
       diff = [
         '~',
-        "File\ffoobar.json",
-        { 'parameters' => { 'notify' => ['Service[foo]'] } },
-        { 'parameters' => { 'notify' => ['Service[foo]'] } }
+        "File\ffoobar.json\fparameters\fnotify",
+        ['Service[foo]'],
+        ['Service[foo]']
       ]
       diff_obj = OctocatalogDiff::API::V1::Diff.new(diff)
       result = subject.filtered?(diff_obj)
@@ -99,9 +99,9 @@
       # This diff should never be produced by the program, but catch the edge case anyway.
       diff = [
         '~',
-        "File\ffoobar.json",
-        { 'parameters' => { 'notify' => 'Service[foo]' } },
-        { 'parameters' => { 'notify' => 'Service[foo]' } }
+        "File\ffoobar.json\fparameters\fnotify",
+        'Service[foo]',
+        'Service[foo]'
       ]
       diff_obj = OctocatalogDiff::API::V1::Diff.new(diff)
       result = subject.filtered?(diff_obj)
@@ -112,8 +112,9 @@
       diff = [
         '~',
         "File\ffoobar.json",
-        { 'parameters' => { 'notify' => 'Service[foo]' } },
-        { 'parameters' => { 'notify' => ['Service[foo]', 'Service[bar]'] } }
+        "File\ffoobar.json\fparameters\fnotify",
+        'Service[foo]',
+        ['Service[foo]', 'Service[bar]']
       ]
       diff_obj = OctocatalogDiff::API::V1::Diff.new(diff)
       result = subject.filtered?(diff_obj)