oxidized-web 0.15.1 → 0.17.0

data/package-lock.json

@@ -9,11 +9,13 @@
       "version": "1.0.0",
       "license": "Apache 2.0",
       "dependencies": {
-        "bootstrap": "^5.3.3",
-        "bootstrap-icons": "^1.11.3",
-        "datatables.net-bs5": "^2.0.7",
-        "datatables.net-buttons-bs5": "^3.0.2",
-        "jquery": "^3.7.1"
+        "bootstrap": "~5.3.3",
+        "bootstrap-icons": "~1.13.1",
+        "datatables.net-bs5": "~2.3.2",
+        "datatables.net-buttons-bs5": "~3.2.4",
+        "dayjs": "~1.11.13",
+        "dayjs-plugin-utc": "~0.1.2",
+        "jquery": "~3.7.1"
       }
     },
     "node_modules/@popperjs/core": {
@@ -27,9 +29,9 @@
       }
     },
     "node_modules/bootstrap": {
-      "version": "5.3.3",
-      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.3.tgz",
-      "integrity": "sha512-8HLCdWgyoMguSO9o+aH+iuZ+aht+mzW0u3HIMzVu7Srrpv7EBBxTnrFlSCskwdY1+EOFQSm7uMJhNQHkdPcmjg==",
+      "version": "5.3.7",
+      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.7.tgz",
+      "integrity": "sha512-7KgiD8UHjfcPBHEpDNg+zGz8L3LqR3GVwqZiBRFX04a1BCArZOz1r2kjly2HQ0WokqTO0v1nF+QAt8dsW4lKlw==",
       "funding": [
         {
           "type": "github",
@@ -45,9 +47,9 @@
       }
     },
     "node_modules/bootstrap-icons": {
-      "version": "1.11.3",
-      "resolved": "https://registry.npmjs.org/bootstrap-icons/-/bootstrap-icons-1.11.3.tgz",
-      "integrity": "sha512-+3lpHrCw/it2/7lBL15VR0HEumaBss0+f/Lb6ZvHISn1mlK83jjFpooTLsMWbIjJMDjDjOExMsTxnXSIT4k4ww==",
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/bootstrap-icons/-/bootstrap-icons-1.13.1.tgz",
+      "integrity": "sha512-ijombt4v6bv5CLeXvRWKy7CuM3TRTuPEuGaGKvTV5cz65rQSY8RQ2JcHt6b90cBBAC7s8fsf2EkQDldzCoXUjw==",
       "funding": [
         {
           "type": "github",
@@ -60,41 +62,51 @@
       ]
     },
     "node_modules/datatables.net": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/datatables.net/-/datatables.net-2.2.2.tgz",
-      "integrity": "sha512-gfODIKE3gpgbVeZy2QGj2Dq9roO6hy00S+k1knklrqlMyAMrh1wt0Q6ryBUM7gU96U77ysbq8dYhxFdmcC/oPQ==",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/datatables.net/-/datatables.net-2.3.2.tgz",
+      "integrity": "sha512-31TzwIQM0+pr2ZOEOEH6dsHd/WSAl5GDDGPezOHPI3mM2NK4lcDyOoG8xXeWmSbVfbi852LNK5C84fpp4Q+qxg==",
       "dependencies": {
         "jquery": ">=1.7"
       }
     },
     "node_modules/datatables.net-bs5": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/datatables.net-bs5/-/datatables.net-bs5-2.2.2.tgz",
-      "integrity": "sha512-0mAbpUf0EpnIEc0RlN6vSrSk9y/+NuReiwDpjHYY3RfzdvH6Lt0+7Q9OU5RIbYxaFxES/z60thxdrw7IUFnBhw==",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/datatables.net-bs5/-/datatables.net-bs5-2.3.2.tgz",
+      "integrity": "sha512-1rh0ZTLoiziIQ4oAtgr+IOYVgJfAIceDnbDe535u8kv191pBAdTrKF6ovQO98Xy9mDXLdLNB7QCrLiV/sgPoQw==",
       "dependencies": {
-        "datatables.net": "2.2.2",
+        "datatables.net": "2.3.2",
         "jquery": ">=1.7"
       }
     },
     "node_modules/datatables.net-buttons": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/datatables.net-buttons/-/datatables.net-buttons-3.2.2.tgz",
-      "integrity": "sha512-+aLTbkbksNmyGpK+8KXbpwYKXYOXvZQR2ySA/8oOQeJU53Xw/67cOHowenEr2d43/RLaz+I0zvV/1Yn+jMRiDw==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/datatables.net-buttons/-/datatables.net-buttons-3.2.4.tgz",
+      "integrity": "sha512-anA39/R0kpHA2DOwqEHy/ZMXD5vf4tWmyNO0BnO0kJG7AFNvGTUCWBnBifXYg3G64U6JYpYY+MuTFKIB1/ZMTQ==",
       "dependencies": {
         "datatables.net": "^2",
         "jquery": ">=1.7"
       }
     },
     "node_modules/datatables.net-buttons-bs5": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/datatables.net-buttons-bs5/-/datatables.net-buttons-bs5-3.2.2.tgz",
-      "integrity": "sha512-xjUcbYCBHcUthD1pvo5ghTNjqE6fTMygRrKd0QjBHKQxcqxmHG/m0djD2s6cFBfm8oov132U7U2JCXgQifOoUA==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/datatables.net-buttons-bs5/-/datatables.net-buttons-bs5-3.2.4.tgz",
+      "integrity": "sha512-yX8Ia32P1D9L02XWjisA6a9fFp0LgmzpIcvf/4ty+QG5/qj1tOOqWgsXsxxIY2Uj918WmLJS6VaJabRAMoAqHA==",
       "dependencies": {
         "datatables.net-bs5": "^2",
-        "datatables.net-buttons": "3.2.2",
+        "datatables.net-buttons": "3.2.4",
         "jquery": ">=1.7"
       }
     },
+    "node_modules/dayjs": {
+      "version": "1.11.13",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz",
+      "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg=="
+    },
+    "node_modules/dayjs-plugin-utc": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/dayjs-plugin-utc/-/dayjs-plugin-utc-0.1.2.tgz",
+      "integrity": "sha512-ExERH5o3oo6jFOdkvMP3gytTCQ9Ksi5PtylclJWghr7k7m3o2U5QrwtdiJkOxLOH4ghr0EKhpqGefzGz1VvVJg=="
+    },
     "node_modules/jquery": {
       "version": "3.7.1",
       "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz",

data/package.json

@@ -12,10 +12,12 @@
   "author": "The oxidized project",
   "license": "Apache 2.0",
   "dependencies": {
-    "bootstrap": "^5.3.3",
-    "bootstrap-icons": "^1.11.3",
-    "datatables.net-bs5": "^2.0.7",
-    "datatables.net-buttons-bs5": "^3.0.2",
-    "jquery": "^3.7.1"
+    "bootstrap": "~5.3.3",
+    "bootstrap-icons": "~1.13.1",
+    "datatables.net-bs5": "~2.3.2",
+    "datatables.net-buttons-bs5": "~3.2.4",
+    "dayjs": "~1.11.13",
+    "dayjs-plugin-utc": "~0.1.2",
+    "jquery": "~3.7.1"
   }
 }

data/spec/spec_helper.rb

@@ -7,5 +7,6 @@ SimpleCov.start
 require 'minitest/autorun'
 require 'rack/test'
 require 'oxidized'
+require 'oxidized/web'
 require 'oxidized/web/webapp'
 require 'mocha/minitest'

data/spec/web/node/show_spec.rb

@@ -0,0 +1,100 @@
+require_relative '../../spec_helper'
+describe Oxidized::API::WebApp do
+  include Rack::Test::Methods
+
+  def app
+    Oxidized::API::WebApp
+  end
+
+  before do
+    @nodes = mock('Oxidized::Nodes')
+    app.set(:nodes, @nodes)
+
+    @serialized_node = {
+      name: "sw5",
+      full_name: "sw5.example.com",
+      ip: "10.42.12.42",
+      group: nil,
+      model: "ios",
+      last: {
+        start: Time.parse("2025-02-05 19:49:00 +0100"),
+        end: Time.parse("2025-02-05 19:49:10 +0100"),
+        status: :no_connection,
+        time: 10
+      },
+      vars: {
+        oxi: "dized",
+        enable: "secret_enable",
+        username: "oxidized",
+        password: "secret_password"
+      },
+      mtime: Time.parse("2025-02-05 19:49:11 +0100")
+    }
+  end
+
+  describe "get /node/show/:node" do
+    it "shows the metadata of a node" do
+      app.set(:configuration, { hide_node_vars: [] })
+      @nodes.expects(:show).with("sw5").returns(@serialized_node)
+
+      get '/node/show/sw5'
+      _(last_response.ok?).must_equal true
+      body = last_response.body
+
+      _(body).must_match(/secret_enable/)
+      _(body).must_match(/secret_password/)
+      _(body.include?(
+          "<code>{\n  &quot;name&quot;: &quot;sw5&quot;," \
+          "\n  &quot;full_name&quot;: &quot;sw5.example.com&quot;," \
+          "\n  &quot;ip&quot;: &quot;10.42.12.42&quot;," \
+          "\n  &quot;group&quot;: null,\n  &quot;model&quot;: &quot;ios&quot;," \
+          "\n  &quot;last&quot;: {" \
+          "\n    &quot;start&quot;: &quot;2025-02-05 19:49:00 +0100&quot;," \
+          "\n    &quot;end&quot;: &quot;2025-02-05 19:49:10 +0100&quot;," \
+          "\n    &quot;status&quot;: &quot;no_connection&quot;," \
+          "\n    &quot;time&quot;: 10\n  }," \
+          "\n  &quot;vars&quot;: {" \
+          "\n    &quot;oxi&quot;: &quot;dized&quot;," \
+          "\n    &quot;enable&quot;: &quot;secret_enable&quot;," \
+          "\n    &quot;username&quot;: &quot;oxidized&quot;," \
+          "\n    &quot;password&quot;: &quot;secret_password&quot;" \
+          "\n  },\n  &quot;mtime&quot;: &quot;2025-02-05 19:49:11 +0100&quot;" \
+          "\n}</code>"
+        )).must_equal true
+    end
+
+    it "hides vars in hide_node_vars" do
+      app.set(:configuration, { hide_node_vars: %i[enable password] })
+      @nodes.expects(:show).with("sw5").returns(@serialized_node)
+
+      get '/node/show/sw5'
+      _(last_response.ok?).must_equal true
+      body = last_response.body
+
+      _(body).wont_match(/secret_enable/)
+      _(body).wont_match(/secret_password/)
+      _(body).must_match(/&lt;hidden&gt;/)
+      _(body.include?(
+          "<code>{\n  &quot;name&quot;: &quot;sw5&quot;," \
+          "\n  &quot;full_name&quot;: &quot;sw5.example.com&quot;," \
+          "\n  &quot;ip&quot;: &quot;10.42.12.42&quot;," \
+          "\n  &quot;group&quot;: null,\n  &quot;model&quot;: &quot;ios&quot;," \
+          "\n  &quot;last&quot;: {" \
+          "\n    &quot;start&quot;: &quot;2025-02-05 19:49:00 +0100&quot;," \
+          "\n    &quot;end&quot;: &quot;2025-02-05 19:49:10 +0100&quot;," \
+          "\n    &quot;status&quot;: &quot;no_connection&quot;," \
+          "\n    &quot;time&quot;: 10\n  }," \
+          "\n  &quot;vars&quot;: {" \
+          "\n    &quot;oxi&quot;: &quot;dized&quot;," \
+          "\n    &quot;enable&quot;: &quot;&lt;hidden&gt;&quot;," \
+          "\n    &quot;username&quot;: &quot;oxidized&quot;," \
+          "\n    &quot;password&quot;: &quot;&lt;hidden&gt;&quot;" \
+          "\n  },\n  &quot;mtime&quot;: &quot;2025-02-05 19:49:11 +0100&quot;" \
+          "\n}</code>"
+        )).must_equal true
+
+      # The note data is not changed (deep copy with Marshal)
+      _(@serialized_node[:vars][:enable]).must_equal "secret_enable"
+    end
+  end
+end

data/spec/web/node/version_spec.rb

@@ -0,0 +1,161 @@
+require_relative '../../spec_helper'
+
+describe Oxidized::API::WebApp do
+  include Rack::Test::Methods
+
+  def app
+    Oxidized::API::WebApp
+  end
+
+  before do
+    @nodes = mock('Oxidized::Nodes')
+    app.set(:nodes, @nodes)
+  end
+
+  describe 'get /node/version.?:format?' do
+    before do
+      @versions = [
+        { oid: "C006", time: Time.parse("2025-02-05 19:49:00 +0100") },
+        { oid: "C003", time: Time.parse("2025-02-05 19:03:00 +0100") },
+        { oid: "C001", time: Time.parse("2025-02-05 19:01:00 +0100") }
+      ]
+    end
+
+    it 'fetches all versions of a node without a group' do
+      @nodes.expects(:version).with('sw5', nil).returns(@versions)
+
+      get '/node/version?node_full=sw5'
+      _(last_response.ok?).must_equal true
+      _(last_response.body.include?(
+          "<tr>\n<td>3</td>\n<td class='time' epoch='1738781340'>" \
+          "2025-02-05 19:49:00 +0100</td>\n"
+        )).must_equal true
+
+      _(last_response.body.include?(
+          "href='/node/version/view?node=sw5&amp;group=&amp;oid=C006&amp;" \
+          "epoch=1738781340&amp;num=3' title='configuration'>"
+        )).must_equal true
+      _(last_response.body.include?(
+          "href='/node/version/diffs?node=sw5&amp;group=&amp;oid=C006&amp;" \
+          "epoch=1738781340&amp;num=3' title='Compare with previous version'>"
+        )).must_equal true
+      _(last_response.body.include?(
+          "href='/node/version/view?node=sw5&amp;group=&amp;oid=C001&amp;" \
+          "epoch=1738778460&amp;num=1' title='configuration'>"
+        )).must_equal true
+      # Compare to the version previous 1 is not possible, so don't display it
+      _(last_response.body.include?(
+          "href='/node/version/diffs?node=sw5&amp;group=&amp;oid=C001&amp;" \
+          "epoch=1738778460&amp;num=1' title='Compare with previous version'>"
+        )).must_equal false
+    end
+
+    it 'fetches all versions of a node with a group' do
+      @nodes.expects(:version).with('sw5', 'group1').returns(@versions)
+
+      get '/node/version?node_full=group1/sw5'
+      _(last_response.ok?).must_equal true
+      _(last_response.body.include?(
+          "<tr>\n<td>3</td>\n<td class='time' epoch='1738781340'>" \
+          "2025-02-05 19:49:00 +0100</td>\n"
+        )).must_equal true
+    end
+
+    it 'fetches all versions of a node with a group with /' do
+      @nodes.expects(:version).with('sw5', 'gr/oup1').returns(@versions)
+
+      get '/node/version?node_full=gr/oup1/sw5'
+      _(last_response.ok?).must_equal true
+      _(last_response.body.include?(
+          "<tr>\n<td>3</td>\n<td class='time' epoch='1738781340'>" \
+          "2025-02-05 19:49:00 +0100</td>\n"
+        )).must_equal true
+    end
+  end
+
+  describe 'get /node/version/view.?:format?' do
+    it 'fetches a previous version from git' do
+      @nodes.expects(:get_version).with('sw5', '', 'c8aa93cab5').returns('Old configuration of sw5')
+
+      get '/node/version/view?node=sw5&group=&oid=c8aa93cab5&epoch=1738781340&num=2'
+      _(last_response.ok?).must_equal true
+      _(last_response.body.include?('Old configuration of sw5')).must_equal true
+      # The test needs to pass in any timezone, so we use Time.parse to get the
+      # right string
+      _(last_response.body.include?(
+          "Date of version:\n" \
+          "<span class='time' epoch='1738781340'>" \
+          "#{Time.at(1738781340)}</span>"
+        )).must_equal true
+    end
+
+    it 'does not display binary content' do
+      @nodes.expects(:get_version).with('sw5', '', 'c8aa93cab5').returns("\xff\x42 binary content\x00")
+
+      get '/node/version/view?node=sw5&group=&oid=c8aa93cab5&epoch=1738781340&num=2'
+      _(last_response.ok?).must_equal true
+      _(last_response.body.include?('cannot display')).must_equal true
+    end
+
+    it 'fetches a git-version when using a group containing /' do
+      @nodes.expects(:get_version).with('sw5', 'my/group', 'c8aa93cab5').returns('Old configuration of sw5')
+
+      get '/node/version/view?node=sw5&group=my/group&oid=c8aa93cab5&epoch=1738781340&num=2'
+      _(last_response.ok?).must_equal true
+      _(last_response.body.include?('Old configuration of sw5')).must_equal true
+    end
+
+    it 'does not encode html-chars in text-format' do
+      configuration = "text &/<> \n ascii;"
+      @nodes.expects(:get_version).with('sw5', '', 'c8aa93cab5').returns(configuration)
+      get '/node/version/view?node=sw5&group=&oid=c8aa93cab5&epoch=1738781340&num=2&format=text'
+
+      _(last_response.ok?).must_equal true
+      _(last_response.body).must_equal configuration
+    end
+
+    it 'does not encode html-chars in json-format' do
+      configuration = "text &/<> \n ascii;"
+      @nodes.expects(:get_version).with('sw5', '', 'c8aa93cab5').returns(configuration)
+      get '/node/version/view?node=sw5&group=&oid=c8aa93cab5&epoch=1738781340&num=2&format=json'
+
+      _(last_response.ok?).must_equal true
+      _(last_response.body).must_equal '["text &/<> \n"," ascii;"]'
+    end
+  end
+
+  describe 'get /node/version/diffs' do
+    it 'diffs a version with the latest configuration' do
+      @versions = [
+        { oid: "C006", time: Time.parse("2025-02-05 19:49:00 +0100") },
+        { oid: "C003", time: Time.parse("2025-02-05 19:03:00 +0100") },
+        { oid: "C001", time: Time.parse("2025-02-05 19:01:00 +0100") }
+      ]
+      @diff = { patch: "diff --git a/sw5 b/sw5\n" \
+                       "index C006..C003 100644\n" \
+                       "--- a/sw5\n" \
+                       "+++ b/sw5\n" \
+                       "@@ -38,12 +38,12 @@ some_line\n " \
+                       "unchanged line\n" \
+                       "-changed line old\n" \
+                       "+changed line new1\n" \
+                       "+changed line new2\n " \
+                       "\n " \
+                       "unchanged line\n",
+                stat: [1, 2] }
+
+      @nodes.expects(:version).with('sw5', nil).returns(@versions)
+      @nodes.expects(:get_diff).returns(@diff)
+
+      get '/node/version/diffs?node=sw5&group=&oid=C006&epoch=1738781340&num=3'
+      _(last_response.ok?).must_equal true
+      # The test needs to pass in any timezone, so we use Time.parse to get the
+      # right string
+      _(last_response.body.include?(
+          "Date of version:\n" \
+          "<span class='time' epoch='1738781340'>" \
+          "#{Time.at(1738781340)}</span>"
+        )).must_equal true
+    end
+  end
+end

data/spec/{node_spec.rb → web/node_spec.rb}

@@ -1,4 +1,4 @@
-require_relative 'spec_helper'
+require_relative '../spec_helper'
 
 describe Oxidized::API::WebApp do
   include Rack::Test::Methods

data/spec/{nodes_spec.rb → web/nodes_spec.rb}

@@ -1,4 +1,4 @@
-require_relative 'spec_helper'
+require_relative '../spec_helper'
 require 'json'
 
 describe Oxidized::API::WebApp do

data/spec/{root_spec.rb → web/root_spec.rb}

@@ -1,4 +1,4 @@
-require_relative 'spec_helper'
+require_relative '../spec_helper'
 
 describe Oxidized::API::WebApp do
   include Rack::Test::Methods

data/spec/{webapp_spec.rb → web/webapp_spec.rb}

@@ -1,4 +1,4 @@
-require_relative 'spec_helper'
+require_relative '../spec_helper'
 
 # Test helper methods in Oxidized::API::WebApp
 

data/spec/web_spec.rb

@@ -0,0 +1,98 @@
+require_relative 'spec_helper'
+
+describe Oxidized::API::Web do
+  describe "#parse_legacy_configuration" do
+    test_cases = [
+      {
+        configuration: '192.168.1.100:9999',
+        expected: { addr: '192.168.1.100', port: 9999, uri_prefix: '/',
+                    vhosts: [], hide_node_vars: [] },
+        description: 'IP address and port'
+      },
+      {
+        configuration: '[::1]:8080',
+        expected: { addr: '[::1]', port: 8080, uri_prefix: '/',
+                    vhosts: [], hide_node_vars: [] },
+        description: 'IPv6 address with port'
+      },
+      {
+        configuration: '1234',
+        expected: { addr: '', port: 1234, uri_prefix: '/',
+                    vhosts: [], hide_node_vars: [] },
+        description: 'port only'
+      },
+      {
+        configuration: '0.0.0.0:9999/api',
+        expected: { addr: '0.0.0.0', port: 9999, uri_prefix: '/api',
+                    vhosts: [], hide_node_vars: [] },
+        description: 'host:port/prefix'
+      },
+      {
+        configuration: '8888/v1',
+        expected: { addr: '', port: 8888, uri_prefix: '/v1',
+                    vhosts: [], hide_node_vars: [] },
+        description: 'port/prefix'
+      },
+      {
+        configuration: '127.0.0.1:3000/api/v2',
+        expected: { addr: '127.0.0.1', port: 3000, uri_prefix: '/api/v2',
+                    vhosts: [], hide_node_vars: [] },
+        description: 'complex URI prefix'
+      },
+      {
+        configuration: '127.0.0.1:3000/',
+        expected: { addr: '127.0.0.1', port: 3000, uri_prefix: '/',
+                    vhosts: [], hide_node_vars: [] },
+        description: 'empty URI prefix after slash'
+      }
+    ]
+
+    test_cases.each do |test_case|
+      it "should parse #{test_case[:description]} correctly" do
+        result = Oxidized::API::Web.parse_legacy_configuration(test_case[:configuration])
+        expect(result).must_equal test_case[:expected]
+      end
+    end
+  end
+
+  describe "#parse_new_configuration" do
+    test_cases = [
+      {
+        configuration: Asetus::ConfigStruct.new(
+          {
+            'listen' => '0.0.0.0',
+            'port' => 3000,
+            'url_prefix' => '/api',
+            'vhosts' => ['example.com', 'test.com'],
+            'hide_node_vars' => %w[enable password]
+          }
+        ),
+        expected: { addr: '0.0.0.0', port: 3000, uri_prefix: '/api',
+                    vhosts: ["example.com", "test.com"],
+                    hide_node_vars: %i[enable password] },
+        description: 'all values provided'
+      },
+      {
+        configuration: Asetus::ConfigStruct.new,
+        expected: { addr: '127.0.0.1', port: 8888, uri_prefix: '/',
+                    vhosts: [], hide_node_vars: [] },
+        description: 'all default values'
+      },
+      {
+        configuration: Asetus::ConfigStruct.new(
+          { 'hide_node_vars' => 'enable' }
+        ),
+        expected: { addr: '127.0.0.1', port: 8888, uri_prefix: '/',
+                    vhosts: [], hide_node_vars: [] },
+        description: 'return an empty list when hide_node_vars not a hash'
+      }
+    ]
+
+    test_cases.each do |test_case|
+      it "should parse #{test_case[:description]} correctly" do
+        result = Oxidized::API::Web.parse_configuration(test_case[:configuration])
+        expect(result).must_equal test_case[:expected]
+      end
+    end
+  end
+end