dom_glancy 0.1.0 → 1.0.0

data/test/selenium_test_helper.rb

@@ -15,9 +15,12 @@ rescue Bundler::BundlerError => e
   exit e.status_code
 end
 
-require 'rails/all'
-require 'dom_glancy'
-require 'test_app/test_app'
+require 'action_controller/railtie'
+require 'action_mailer/railtie'
+require 'sprockets/railtie'
+require 'rails/test_unit/railtie'
+
+require File.expand_path('../test_app/config/environment', __FILE__)
 
 require 'minitest/autorun'
 
@@ -38,110 +41,108 @@ Dir[test_helper_location].each { |f| require f }
 
 Capybara.default_driver = :selenium
 
-module DomGlancy
-  class SeleniumTestCase < Minitest::Test
-    include DomGlancy
-    include DomGlancy::TestObjects
-    include DomGlancy::TestHelpers::Location
-
-    include Capybara::DSL
+class SeleniumTestCase < Minitest::Test
+  include TestObjects
+  include TestHelpers::Location
 
-    def setup
-      delete_contents_from_dom_glancy_locations
-      initialize_browser_size_for_test
-    end
+  include Capybara::DSL
 
-    def teardown
-      delete_contents_from_dom_glancy_locations
-    end
+  def setup
+    @dom_glancy = DomGlancy::DomGlancy.new
+    delete_contents_from_dom_glancy_locations
+    initialize_browser_size_for_test
+  end
 
-    def initialize_browser_size_for_test
-      @browser_dimensions = ENV['BROWSER_SIZE'] || '960x1000'
-      if @browser_dimensions
-        @starting_dimensions = get_current_browser_dimensions
-        w = @browser_dimensions.split('x')[0]
-        h = @browser_dimensions.split('x')[1]
-        resize_browser(w, h)
-      end
-    end
+  def teardown
+    delete_contents_from_dom_glancy_locations
+  end
 
-    def visit_index
-      PageObjects::DomGlancy::IndexPage.visit
+  def initialize_browser_size_for_test
+    @browser_dimensions = ENV['BROWSER_SIZE'] || '960x1000'
+    if @browser_dimensions
+      @starting_dimensions = get_current_browser_dimensions
+      w = @browser_dimensions.split('x')[0]
+      h = @browser_dimensions.split('x')[1]
+      resize_browser(w, h)
     end
+  end
 
-    def remove_about_element
-      js = <<-JS
-        var element = document.getElementById('js-kr--nav');
-        element.parentNode.removeChild(element);
-      JS
+  def visit_index
+    PageObjects::DomGlancy::IndexPage.visit
+  end
 
-      page.driver.browser.execute_script(js)
-    end
+  def remove_about_element
+    js = <<-JS
+      var element = document.getElementById('js-kr--nav');
+      element.parentNode.removeChild(element);
+    JS
 
-    def add_centered_element(text_content)
-      js = <<-JS
-            var centeredElement = document.createElement('div');
-            centeredElement.style.textAlign = 'center';
-            centeredElement.style.fontSize = '2em';
-            centeredElement.style.width = '400px';
-            centeredElement.style.marginLeft = 'auto';
-            centeredElement.style.marginRight = 'auto';
-            centeredElement.id = 'hack-element';
-            centeredElement.textContent = '#{text_content}';
-            centeredElement.style.backgroundColor = '#ff0000'
-            document.getElementsByTagName('body')[0].appendChild(centeredElement);
-      JS
-
-      page.driver.browser.execute_script(js)
-    end
+    page.driver.browser.execute_script(js)
+  end
 
-    def resize_browser(width, height)
-      page.driver.browser.manage.window.resize_to(width.to_i, height.to_i)
-    end
+  def add_centered_element(text_content)
+    js = <<-JS
+      var centeredElement = document.createElement('div');
+      centeredElement.style.textAlign = 'center';
+      centeredElement.style.fontSize = '2em';
+      centeredElement.style.width = '400px';
+      centeredElement.style.marginLeft = 'auto';
+      centeredElement.style.marginRight = 'auto';
+      centeredElement.id = 'hack-element';
+      centeredElement.textContent = '#{text_content}';
+      centeredElement.style.backgroundColor = '#ff0000'
+      document.getElementsByTagName('body')[0].appendChild(centeredElement);
+    JS
+
+    page.driver.browser.execute_script(js)
+  end
 
-    def get_current_browser_dimensions
-      page.driver.browser.manage.window.size
-    end
+  def resize_browser(width, height)
+    page.driver.browser.manage.window.resize_to(width.to_i, height.to_i)
+  end
 
-    def assert_artifacts_on_difference(test_root)
-      filename = DomGlancy.diff_filename(test_root)
-      assert File.exists?(filename), "Diff file should exist: #{filename}"
+  def get_current_browser_dimensions
+    page.driver.browser.manage.window.size
+  end
 
-      filename = File.join(DomGlancy.diff_file_location, "#{test_root}__changed_master__diff.yaml")
-      assert File.exists?(filename), "Changed master file should exist: #{filename}"
+  def assert_artifacts_on_difference(test_root)
+    filename = DomGlancy::DomGlancy.diff_filename(test_root)
+    assert File.exists?(filename), "Diff file should exist: #{filename}"
 
-      filename = File.join(DomGlancy.diff_file_location, "#{test_root}__current_not_master__diff.yaml")
-      assert File.exists?(filename), "Current, not master, file should exist: #{filename}"
+    filename = File.join(DomGlancy.configuration.diff_file_location, "#{test_root}__changed_master__diff.yaml")
+    assert File.exists?(filename), "Changed master file should exist: #{filename}"
 
-      filename = File.join(DomGlancy.diff_file_location, "#{test_root}__master_not_current__diff.yaml")
-      assert File.exists?(filename), "Master, not current, file should exist: #{filename}"
+    filename = File.join(DomGlancy.configuration.diff_file_location, "#{test_root}__current_not_master__diff.yaml")
+    assert File.exists?(filename), "Current, not master, file should exist: #{filename}"
 
-      filename = DomGlancy.master_filename(test_root)
-      assert File.exists?(filename), "Master file should exist: #{filename}"
+    filename = File.join(DomGlancy.configuration.diff_file_location, "#{test_root}__master_not_current__diff.yaml")
+    assert File.exists?(filename), "Master, not current, file should exist: #{filename}"
 
-      filename = DomGlancy.current_filename(test_root)
-      assert File.exists?(filename), "Current file should exist: #{filename}"
-    end
+    filename = DomGlancy::DomGlancy.master_filename(test_root)
+    assert File.exists?(filename), "Master file should exist: #{filename}"
 
-    def assert_artifacts_on_same(test_root)
-      filename = DomGlancy.diff_filename(test_root)
-      refute File.exists?(filename), "No diff file should exist: #{filename}"
+    filename = DomGlancy::DomGlancy.current_filename(test_root)
+    assert File.exists?(filename), "Current file should exist: #{filename}"
+  end
 
-      filename = File.join(DomGlancy.diff_file_location, "#{test_root}__changed_master__diff.yaml")
-      refute File.exists?(filename), "No changed master file should exist: #{filename}"
+  def assert_artifacts_on_same(test_root)
+    filename = DomGlancy::DomGlancy.diff_filename(test_root)
+    refute File.exists?(filename), "No diff file should exist: #{filename}"
 
-      filename = File.join(DomGlancy.diff_file_location, "#{test_root}__current_not_master__diff.yaml")
-      refute File.exists?(filename), "No current, not master, file should exist: #{filename}"
+    filename = File.join(DomGlancy.configuration.diff_file_location, "#{test_root}__changed_master__diff.yaml")
+    refute File.exists?(filename), "No changed master file should exist: #{filename}"
 
-      filename = File.join(DomGlancy.diff_file_location, "#{test_root}__master_not_current__diff.yaml")
-      refute File.exists?(filename), "No master, not current, file should exist: #{filename}"
+    filename = File.join(DomGlancy.configuration.diff_file_location, "#{test_root}__current_not_master__diff.yaml")
+    refute File.exists?(filename), "No current, not master, file should exist: #{filename}"
 
-      filename = DomGlancy.master_filename(test_root)
-      assert File.exists?(filename), "Master file should exist: #{filename}"
+    filename = File.join(DomGlancy.configuration.diff_file_location, "#{test_root}__master_not_current__diff.yaml")
+    refute File.exists?(filename), "No master, not current, file should exist: #{filename}"
 
-      filename = DomGlancy.current_filename(test_root)
-      refute File.exists?(filename), "No current file should exist: #{filename}"
-    end
+    filename = DomGlancy::DomGlancy.master_filename(test_root)
+    assert File.exists?(filename), "Master file should exist: #{filename}"
 
+    filename = DomGlancy::DomGlancy.current_filename(test_root)
+    refute File.exists?(filename), "No current file should exist: #{filename}"
   end
+
 end

data/test/test_app/Gemfile

@@ -2,9 +2,7 @@ source 'https://rubygems.org'
 
 gem 'rails', '3.2.16'
 gem 'json'
-gem 'sqlite3'
 
 group :test, :development do
   gem 'dom_glancy', :path => '../..'
 end
-

data/test/test_app/Rakefile

@@ -0,0 +1,3 @@
+require File.expand_path('../config/application', __FILE__)
+
+TestApp::Application.load_tasks

data/test/test_app/app/views/layouts/local.html.erb

@@ -2,8 +2,7 @@
 <html>
 <head>
   <title>Local</title>
-  <%= stylesheet_link_tag "local_app" %>
-
+  <%= stylesheet_link_tag 'local_app' %>
 </head>
 <body>
   <h1>local layout</h1>
@@ -11,4 +10,4 @@
     <%= yield %>
   <hr/>
 </body>
-</html>
+</html>

data/test/test_app/config/application.rb

@@ -0,0 +1,29 @@
+require 'action_controller/railtie'
+require 'action_mailer/railtie'
+require 'sprockets/railtie'
+require 'rails/test_unit/railtie'
+
+if defined?(Bundler)
+  Bundler.require(*Rails.groups(:assets => %w(development test)))
+end
+
+module TestApp
+  class Application < Rails::Application
+    config.eager_load = true
+    config.cache_classes = true
+    config.serve_static_assets = true
+    config.static_cache_control = "public, max-age=3600"
+    config.active_support.deprecation  = :stderr
+
+    config.encoding = 'utf-8'
+    config.filter_parameters += [:password]
+    config.assets.enabled = true
+    config.assets.version = '1.0'
+
+    # Configure cookies
+    config.secret_token = (('a'..'z').to_a * 2).join
+    config.session_store :cookie_store
+
+    I18n.enforce_available_locales = false
+  end
+end

data/test/test_app/config/boot.rb

@@ -0,0 +1,6 @@
+require 'rubygems'
+
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+
+require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])

data/test/test_app/config/environment.rb

@@ -0,0 +1,2 @@
+require File.expand_path('../application', __FILE__)
+TestApp::Application.initialize!

data/test/test_app/config/initializers/dom_glancy_initializer.rb

@@ -1,5 +1,9 @@
-DomGlancy.master_file_location  = Rails.root.join('tmp', 'data', 'map', 'masters')
-DomGlancy.current_file_location = Rails.root.join('tmp', 'data', 'map', 'current')
-DomGlancy.diff_file_location    = Rails.root.join('tmp', 'data', 'map', 'diff')
+DomGlancy.configure do |c|
+  c.master_file_location  = Rails.root.join('tmp', 'data', 'map', 'masters')
+  c.current_file_location = Rails.root.join('tmp', 'data', 'map', 'current')
+  c.diff_file_location    = Rails.root.join('tmp', 'data', 'map', 'diff')
+end
 
-DomGlancy.create_comparison_directories
+FileUtils.mkdir_p(DomGlancy.configuration.master_file_location)
+FileUtils.mkdir_p(DomGlancy.configuration.diff_file_location)
+FileUtils.mkdir_p(DomGlancy.configuration.current_file_location)

data/test/test_app/config.ru

@@ -1,31 +1,4 @@
 # This file is used by Rack-based servers to start the application.
-ENV['RAILS_ENV'] = 'development'
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..'))
-
-require 'rubygems'
-require 'bundler'
-
-# Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __FILE__)
-
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
-
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-
-require "action_controller/railtie"
-require "sprockets/railtie"
-require 'rails'
-
+require File.expand_path('../config/environment', __FILE__)
 require 'dom_glancy'
-
-Rails.backtrace_cleaner.remove_silencers!
-
-require 'test_app'
-run DomGlancyApp::Application
+run TestApp::Application

data/test/test_app/script/rails

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+
+APP_PATH = File.expand_path('../../config/application',  __FILE__)
+require File.expand_path('../../config/boot',  __FILE__)
+require 'rails/commands'

data/test/test_helper.rb

@@ -31,13 +31,11 @@ Dir[test_objects_location].each { |f| require f }
 test_helper_location = File.expand_path('../test_helpers/**/*.rb', __FILE__)
 Dir[test_helper_location].each { |f| require f }
 
+class DomGlancyTestCase < Minitest::Test
+  include TestObjects
+  include TestHelpers::Location
 
-module DomGlancy
-  class DomGlancyTestCase < Minitest::Test
-
-    include DomGlancy
-    include DomGlancy::TestObjects
-    include DomGlancy::TestHelpers::Location
-
+  def setup
+    @dom_glancy = DomGlancy::DomGlancy.new
   end
 end

data/test/test_helpers/location_helpers.rb

@@ -1,28 +1,30 @@
-module DomGlancy
-  module TestHelpers
-    module Location
-      def prep_locations_for_test
-        @locations_root = File.expand_path('../../tmp', __FILE__)
+module TestHelpers
+  module Location
+    def prep_locations_for_test
+      @locations_root = File.expand_path('../../tmp', __FILE__)
 
-        DomGlancy.master_file_location  = File.join(@locations_root, 'masters')
-        DomGlancy.current_file_location = File.join(@locations_root, 'current')
-        DomGlancy.diff_file_location    = File.join(@locations_root, 'diff')
-
-        DomGlancy.create_comparison_directories
+      DomGlancy.configure do |config|
+        config.master_file_location  = File.join(@locations_root, 'masters')
+        config.current_file_location = File.join(@locations_root, 'current')
+        config.diff_file_location    = File.join(@locations_root, 'diff')
       end
 
-      def delete_test_locations
-        FileUtils.rm_rf DomGlancy.master_file_location
-        FileUtils.rm_rf DomGlancy.current_file_location
-        FileUtils.rm_rf DomGlancy.diff_file_location
-      end
+      FileUtils.mkdir_p(DomGlancy.configuration.master_file_location)
+      FileUtils.mkdir_p(DomGlancy.configuration.diff_file_location)
+      FileUtils.mkdir_p(DomGlancy.configuration.current_file_location)
+    end
 
-      def delete_contents_from_dom_glancy_locations
-        Dir[File.join(DomGlancy.master_file_location, "*.yaml")].each { |file| FileUtils.rm_rf file }
-        Dir[File.join(DomGlancy.current_file_location, "*.yaml")].each { |file| FileUtils.rm_rf file }
-        Dir[File.join(DomGlancy.diff_file_location, "*.html")].each { |file| FileUtils.rm_rf file }
-        Dir[File.join(DomGlancy.diff_file_location, "*.yaml")].each { |file| FileUtils.rm_rf file }
-      end
+    def delete_test_locations
+      FileUtils.rm_rf DomGlancy.configuration.master_file_location
+      FileUtils.rm_rf DomGlancy.configuration.current_file_location
+      FileUtils.rm_rf DomGlancy.configuration.diff_file_location
+    end
+
+    def delete_contents_from_dom_glancy_locations
+      Dir[File.join(DomGlancy.configuration.master_file_location, '*.yaml')].each  { |file| FileUtils.rm_rf file }
+      Dir[File.join(DomGlancy.configuration.current_file_location, '*.yaml')].each { |file| FileUtils.rm_rf file }
+      Dir[File.join(DomGlancy.configuration.diff_file_location, '*.html')].each    { |file| FileUtils.rm_rf file }
+      Dir[File.join(DomGlancy.configuration.diff_file_location, '*.yaml')].each    { |file| FileUtils.rm_rf file }
     end
   end
 end

data/test/test_objects/test_objects.rb

@@ -1,34 +1,33 @@
-module DomGlancy
-  module TestObjects
-    def array_of_elements
-      [
-        {"id"=>"1", "height"=>238, "visible"=>true, "tag"=>"DIV", "width"=>720, "class"=>"grid", "left"=>43, "top"=>14},
-        {"id"=>"2", "height"=>132, "visible"=>true, "tag"=>"DIV", "width"=>700, "class"=>"row", "left"=>53, "top"=>14},
-        {"id"=>"3", "height"=>132, "visible"=>true, "tag"=>"DIV", "width"=>340, "class"=>"slot-0-1-2 mm--title_text_main", "left"=>53, "top"=>14},
-        {"id"=>"4", "height"=>132, "visible"=>true, "tag"=>"H1", "width"=>340, "class"=>"", "left"=>53, "top"=>14},
-        {"id"=>"5", "height"=>0, "visible"=>true, "tag"=>"SPAN", "width"=>0, "class"=>"mm--title_text_sub", "left"=>71, "top"=>86},
-        {"id"=>"6", "height"=>55, "visible"=>true, "tag"=>"DIV", "width"=>700, "class"=>"row", "left"=>53, "top"=>160},
-        {"id"=>"7", "height"=>55, "visible"=>true, "tag"=>"DIV", "width"=>340, "class"=>"slot-0-1-2", "left"=>53, "top"=>160},
-        {"id"=>"8", "height"=>55, "visible"=>true, "tag"=>"H2", "width"=>340, "class"=>"", "left"=>53, "top"=>160},
-        {"id"=>"9", "height"=>23, "visible"=>true, "tag"=>"DIV", "width"=>700, "class"=>"row", "left"=>53, "top"=>229},
-        {"id"=>"10", "height"=>21, "visible"=>true, "tag"=>"DIV", "width"=>100, "class"=>"slot-0 mm--nav", "left"=>53, "top"=>231},
-        {"id"=>"11", "height"=>21, "visible"=>true, "tag"=>"DIV", "width"=>100, "class"=>"slot-1 mm--nav", "left"=>173, "top"=>231}
-      ]
-    end
+module TestObjects
+  def array_of_elements
+    [
+      {"id"=>"1", "height"=>238, "visible"=>true, "tag"=>"DIV", "width"=>720, "class"=>"grid", "left"=>43, "top"=>14},
+      {"id"=>"2", "height"=>132, "visible"=>true, "tag"=>"DIV", "width"=>700, "class"=>"row", "left"=>53, "top"=>14},
+      {"id"=>"3", "height"=>132, "visible"=>true, "tag"=>"DIV", "width"=>340, "class"=>"slot-0-1-2 mm--title_text_main", "left"=>53, "top"=>14},
+      {"id"=>"4", "height"=>132, "visible"=>true, "tag"=>"H1", "width"=>340, "class"=>"", "left"=>53, "top"=>14},
+      {"id"=>"5", "height"=>0, "visible"=>true, "tag"=>"SPAN", "width"=>0, "class"=>"mm--title_text_sub", "left"=>71, "top"=>86},
+      {"id"=>"6", "height"=>55, "visible"=>true, "tag"=>"DIV", "width"=>700, "class"=>"row", "left"=>53, "top"=>160},
+      {"id"=>"7", "height"=>55, "visible"=>true, "tag"=>"DIV", "width"=>340, "class"=>"slot-0-1-2", "left"=>53, "top"=>160},
+      {"id"=>"8", "height"=>55, "visible"=>true, "tag"=>"H2", "width"=>340, "class"=>"", "left"=>53, "top"=>160},
+      {"id"=>"9", "height"=>23, "visible"=>true, "tag"=>"DIV", "width"=>700, "class"=>"row", "left"=>53, "top"=>229},
+      {"id"=>"10", "height"=>21, "visible"=>true, "tag"=>"DIV", "width"=>100, "class"=>"slot-0 mm--nav", "left"=>53, "top"=>231},
+      {"id"=>"11", "height"=>21, "visible"=>true, "tag"=>"DIV", "width"=>100, "class"=>"slot-1 mm--nav", "left"=>173, "top"=>231}
+    ]
+  end
 
-    def array_of_elements_small
-      [
-          {"id"=>"12", "height"=>238, "visible"=>true, "tag"=>"DIV", "width"=>720, "class"=>"grid", "left"=>43, "top"=>14},
-          {"id"=>"14", "height"=>0, "visible"=>true, "tag"=>"SPAN", "width"=>0, "class"=>"mm--title_text_sub", "left"=>71, "top"=>86}
-      ]
-    end
+  def array_of_elements_small
+    [
+        {"id"=>"12", "height"=>238, "visible"=>true, "tag"=>"DIV", "width"=>720, "class"=>"grid", "left"=>43, "top"=>14},
+        {"id"=>"14", "height"=>0, "visible"=>true, "tag"=>"SPAN", "width"=>0, "class"=>"mm--title_text_sub", "left"=>71, "top"=>86}
+    ]
+  end
 
-    def single_element_hash
-      {"id"=>"mm--single_added", "height"=>10, "visible"=>true, "tag"=>"SPAN", "width"=>50, "class"=>"mm--title_text_sub", "left"=>71, "top"=>86}
-    end
+  def single_element_hash
+    {"id"=>"mm--single_added", "height"=>10, "visible"=>true, "tag"=>"SPAN", "width"=>50, "class"=>"mm--title_text_sub", "left"=>71, "top"=>86}
+  end
 
-    def travis_generated_current_2
-      data = <<-DATA
+  def travis_generated_current_2
+    data = <<-DATA
 ---
 - height: 45
   width: 784
@@ -590,12 +589,12 @@ module DomGlancy
   top: 0
   left: 0
   visible: false
-
+  
       DATA
-
+  
       YAML::load(data)
     end
-
+  
     def travis_local_generated_master_2
       data = <<-DATA
 ---
@@ -1160,11 +1159,11 @@ module DomGlancy
   left: 0
   visible: false
       DATA
-
+  
       YAML::load(data)
     end
-
-
+  
+  
     def travis_generated_current
       data = <<-DATA
 ---
@@ -1592,12 +1591,12 @@ module DomGlancy
   top: 0
   left: 0
   visible: false
-      DATA
-      YAML::load(data)
-    end
+    DATA
+    YAML::load(data)
+  end
 
-    def travis_local_generated_master
-      data = <<-DATA
+  def travis_local_generated_master
+    data = <<-DATA
 ---
 - height: 45
   width: 800
@@ -2024,8 +2023,7 @@ module DomGlancy
   left: 0
   visible: false
 
-      DATA
-      YAML::load(data)
-    end
+    DATA
+    YAML::load(data)
   end
 end

data/test/unit/analysis_test.rb

@@ -1,13 +1,12 @@
 require 'test_helper'
 
-class AnalysisTest < DomGlancy::DomGlancyTestCase
+class AnalysisTest < DomGlancyTestCase
 
   def test_same_elements
-
     master_data = array_of_elements
     current_data = array_of_elements
 
-    analysis = analyze(master_data, current_data)
+    analysis = @dom_glancy.analyze(master_data, current_data)
 
     assert_equal 0, analysis[:not_in_master].count, 'results of data analysis: not_in_master'
     assert_equal 0, analysis[:not_in_current].count, 'results of data analysis: not_in_current'
@@ -19,7 +18,7 @@ class AnalysisTest < DomGlancy::DomGlancyTestCase
     current_data = array_of_elements_small
     current_data.first['id'] = 'some-new-id'
 
-    analysis = analyze(master_data, current_data)
+    analysis = @dom_glancy.analyze(master_data, current_data)
 
     assert_equal 1, analysis[:not_in_master].count, 'results of data analysis: not_in_master'
     assert_equal 1, analysis[:not_in_current].count, 'results of data analysis: not_in_current'
@@ -31,7 +30,7 @@ class AnalysisTest < DomGlancy::DomGlancyTestCase
     current_data = array_of_elements
     current_data << single_element_hash
 
-    analysis = analyze(master_data, current_data)
+    analysis = @dom_glancy.analyze(master_data, current_data)
 
     assert_equal 1, analysis[:not_in_master].count, 'results of data analysis: not_in_master'
     assert_equal 0, analysis[:not_in_current].count, 'results of data analysis: not_in_current'
@@ -44,7 +43,7 @@ class AnalysisTest < DomGlancy::DomGlancyTestCase
     current_data[0]['height'] = current_data[0]['height'] + 16
     current_data[1]['width'] = current_data[1]['width'] + 25
 
-    analysis = analyze(master_data, current_data)
+    analysis = @dom_glancy.analyze(master_data, current_data)
 
     assert_equal 0, analysis[:not_in_master].count, 'results of data analysis: not_in_master'
     assert_equal 0, analysis[:not_in_current].count, 'results of data analysis: not_in_current'
@@ -59,7 +58,7 @@ class AnalysisTest < DomGlancy::DomGlancyTestCase
 
     current_data[1]['height'] = current_data[1]['height'] + 3
 
-    analysis = analyze(master_data, current_data)
+    analysis = @dom_glancy.analyze(master_data, current_data)
 
     assert_equal 0, analysis[:not_in_master].count, 'results of data analysis: not_in_master'
     assert_equal 0, analysis[:not_in_current].count, 'results of data analysis: not_in_current'
@@ -76,7 +75,7 @@ class AnalysisTest < DomGlancy::DomGlancyTestCase
     current_data.delete_at(5)                                    ## the one missing
     current_data << single_element_hash                          ## the one added
 
-    analysis = analyze(master_data, current_data)
+    analysis = @dom_glancy.analyze(master_data, current_data)
 
     assert_equal 1, analysis[:not_in_master].count, 'results of data analysis: not_in_master'
     assert_equal 1, analysis[:not_in_current].count, 'results of data analysis: not_in_current'
@@ -88,7 +87,7 @@ class AnalysisTest < DomGlancy::DomGlancyTestCase
     master_data  = travis_local_generated_master
     current_data = travis_generated_current
 
-    analysis = analyze(master_data, current_data)
+    analysis = @dom_glancy.analyze(master_data, current_data)
     assert_equal 0, analysis[:not_in_master].count, 'results of data analysis: not_in_master'
     assert_equal 0, analysis[:not_in_current].count, 'results of data analysis: not_in_current'
     assert_equal 0, analysis[:changed_element_pairs].count, 'changed element pairs'
@@ -99,7 +98,7 @@ class AnalysisTest < DomGlancy::DomGlancyTestCase
     master_data  = travis_local_generated_master_2
     current_data = travis_generated_current_2
 
-    analysis = analyze(master_data, current_data)
+    analysis = @dom_glancy.analyze(master_data, current_data)
 
     ## real difference that was found on travis with the INPUT tags being different styles/sizes if not css-styled
     assert_equal 0, analysis[:not_in_master].count, 'results of data analysis: not_in_master'