dom_glancy 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2652a65dec1c5c98ff34e5c08d53fee7f2d37491
-  data.tar.gz: f6a4fcfef1372c84781e2af456e85f2c27e79cd1
+  metadata.gz: b4f6b85d8b3b3b443273ccd45b0d0ebc35ac1a49
+  data.tar.gz: 0e8ad79d21beace912bc8a6a656ca5a064045c83
 SHA512:
-  metadata.gz: bfb04f669881c5e6c30f05a4015b93ecfd5f712a207ef02a67b880e297ea9fcf6a0044a4606fc2655d98f07734d84200ee97d640a93dc1c2af37f86fe19ad39a
-  data.tar.gz: 066fe6d51d913d860d17b5140a2c43adc8f9275b48eebbb51c3ce387a3579f758213b2cf0208259c72a62acb36aa302277a1951cd66df066ecd332e609a0a8e2
+  metadata.gz: 09c300f922d5983a387d2e5c68566b0e33c9596661b33f89c3c5ff4150b6975ca70e7a25554be56ddc21b935e78d45a2e0c4c79b4c3b0cf7bff6b7381695d018
+  data.tar.gz: 9f315183d832157878c0456682275ea7f059f211463179abfad71e28e065e7cea9169e09836e0a2f2ecec370aa520b6637a21a5931b74dc6047d70cf735b7efc

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.0.1
+
+- Fix 'make master' bug
+- Style links a bit on new page for usability
+
 ## 1.0.0
 
 - Change configuration syntax

data/Gemfile

@@ -12,4 +12,4 @@ gem 'mocha'
 
 gem 'selenium-webdriver', '2.44.0'
 gem 'capybara', '2.2.1'
-gem 'ae_page_objects', '1.0.0'
+gem 'ae_page_objects', '1.3.0'

data/app/assets/stylesheets/dom_glancy.css

@@ -129,8 +129,7 @@ a.kr:active  { text-decoration:none; color: #A3906D; }
 }
 
 .kr--artifacts td {
-    padding-left: 7px;
-    padding-right: 7px;
+    padding: 7px;
 }
 
 .kr--button {

data/app/controllers/dom_glancy_controller.rb

@@ -34,8 +34,8 @@ class DomGlancyController < DomGlancyApplicationController
 
   def make_master
     test_root = params[:file]
-    src = DomGlancy.configuration.current_filename(test_root)
-    dst = DomGlancy.configuration.master_filename(test_root)
+    src = DomGlancy::DomGlancy.current_filename(test_root)
+    dst = DomGlancy::DomGlancy.master_filename(test_root)
     FileUtils.cp src, dst
 
     redirect_to '/dom_glancy/new'
@@ -43,7 +43,7 @@ class DomGlancyController < DomGlancyApplicationController
 
   def delete_current
     test_root = params[:file]
-    src = DomGlancy.configuration.current_filename(test_root)
+    src = DomGlancy::DomGlancy.current_filename(test_root)
     FileUtils.rm_rf src
 
     redirect_to '/dom_glancy/new'

data/app/views/dom_glancy/new.html.erb

@@ -3,12 +3,12 @@
 </div>
 
 <div class="row">
-  <table class='kr kr--artifacts'>
+  <table class='kr kr--artifacts' id='js--files'>
     <% @extra_files.each do |f| %>
-      <tr>
+      <tr class='js--new_files'>
         <td><%= f %></td>
-        <td><%= link_to 'make master', "make_master/#{f}", :class => 'kr' %></td>
-        <td><%= link_to 'delete', "delete_current/#{f}", :class => 'kr' %></td>
+        <td><%= link_to 'make master', "make_master/#{f}", :class => 'kr kr--button kr--button-small' %></td>
+        <td><%= link_to 'delete', "delete_current/#{f}", :class => 'kr kr--button kr--button-small' %></td>
       </tr>
     <% end %>
   </table>

data/app/views/shared/_dom_glancy_nav.html.erb

@@ -4,5 +4,5 @@
   <!--<a href="/dom_glancy/artifacts" class="kr"><div class="slot-2 kr--nav">artifacts</div></a>-->
   <a href="/dom_glancy/config" class="kr"><div class="slot-3 kr--nav">config</div></a>
   <a href="/dom_glancy/clear" class="kr"><div class="slot-4 kr--nav">clear</div></a>
-  <a href="/dom_glancy/about" class="kr"><div class="slot-5 kr--nav">about</div></a>
+  <a href="/dom_glancy/about" class="kr"><div class="slot-5 kr--nav" id="js--about">about</div></a>
 </div>

data/lib/dom_glancy/analysis.rb

@@ -30,7 +30,7 @@ module DomGlancy
           set_master_not_current.delete(item2)
         end
 
-        changed_element_pairs.select!{ |pair| !DOMElement.new(pair[0]).close_enough?(DOMElement.new(pair[1])) }
+        changed_element_pairs.select!{ |pair| !DOMElement.new(add_similarity(pair[0])).close_enough?(DOMElement.new(add_similarity(pair[1]))) }
         changed_element_pairs.each do |pair|
           set_changed_master.add(pair.first)
         end
@@ -95,7 +95,7 @@ module DomGlancy
         set2.each do |item2|
           element2 = DOMElement.new(item2)
           if element1.same_element?(element2)
-            same_but_different_pairs << [item1, item2] #unless element1.close_enough?(element2)
+            same_but_different_pairs << [item1, item2]
           end
         end
       end
@@ -105,9 +105,9 @@ module DomGlancy
     def pairs_that_are_close_enough(set1, set2)
       ok_pairs = []
       set1.each do |item1|
-        element1 = DOMElement.new(item1)
+        element1 = DOMElement.new(add_similarity(item1))
         set2.each do |item2|
-          element2 = DOMElement.new(item2)
+          element2 = DOMElement.new(add_similarity(item2))
           if element1.same_element?(element2) && element1.close_enough?(element2)
             ok_pairs << [item1, item2]
           end
@@ -134,6 +134,11 @@ module DomGlancy
       msg.join("\n")
     end
 
+    def add_similarity(element)
+      element.merge(:similarity => ::DomGlancy.configuration.similarity)
+    end
+
+
     def blessing_copy_string(test_root)
       "cp #{DomGlancy.current_filename(test_root)} #{DomGlancy.master_filename(test_root)}"
     end

data/lib/dom_glancy/configuration.rb

@@ -5,18 +5,20 @@ module DomGlancy
 
   def self.configure
     self.configuration ||= Configuration.new
-    yield(configuration)
+    yield(configuration) if block_given?
   end
 
   class Configuration
     attr_accessor :master_file_location
     attr_accessor :diff_file_location
     attr_accessor :current_file_location
+    attr_accessor :similarity
 
     def initialize
       @master_file_location  = nil
       @diff_file_location    = nil
       @current_file_location = nil
+      @similarity            = 15
     end
   end
 end

data/lib/dom_glancy/element.rb

@@ -25,7 +25,7 @@ module DomGlancy
       @id         = h[:id]         || h['id']
       @style      = h[:style]      || h['style']
       @visible    = h[:visible]    || h['visible']
-      @similarity = h[:similarity] || h['similarity'] || 15
+      @similarity = h[:similarity] || h['similarity'] || 0
     end
 
     def same_element?(anOther)

data/lib/dom_glancy/version.rb

@@ -1,3 +1,3 @@
 module DomGlancy
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.0.1'.freeze
 end

data/test/page_objects/dom_glancy/new_page.rb

@@ -1,7 +1,21 @@
 module PageObjects
   module DomGlancy
+    class NewFile < AePageObjects::Element
+      element :name, :locator => 'td:nth-child(1)'
+      def make_master
+        node.click_link_or_button('make master')
+        window.change_to(NewPage)
+      end
+      def delete
+        node.click_link_or_button('delete')
+        window.change_to(NewPage)
+      end
+    end
+
     class NewPage < ViewerPage
       path '/dom_glancy/new'
+
+      collection :files, :locator => '#js--files', :item_locator => '.js--new_files', :contains => NewFile
     end
   end
 end

data/test/selenium/mapping_test.rb

@@ -78,6 +78,24 @@ class MappingTest < SeleniumTestCase
     assert_equal 0, index_page.files.count, 'number of difference files'
   end
 
+  def test_mapping__similarity
+    visit_index
+
+    map_current_page_and_save_as_master('dom_glancy_index')
+
+    assert_equal 15, DomGlancy.configuration.similarity, 'Dom Glancy similarity value'
+
+    resize_about_element(15)    # increase the size of the about element by the similarity amount and it should be same
+
+    same, msg = @dom_glancy.page_map_same?('dom_glancy_index')
+    assert same, msg
+
+    resize_about_element(1)     # increase the size of the about element by 1 more pixel and it should be NOT same
+
+    same, msg = @dom_glancy.page_map_same?('dom_glancy_index')
+    refute same, msg
+  end
+
   def test_non_dom_glancy_page__pass
     local_page = PageObjects::DomGlancy::LocalIndexPage.visit
 

data/test/selenium/viewer_test.rb

@@ -18,4 +18,31 @@ class ViewerTest < SeleniumTestCase
 
     index_page = about_page.navigation.home!
   end
+
+  def test_make_master
+    names = %w(steven_gerrard jordan_henderson adam_lallana)
+    names.each { |name| File.open(DomGlancy::DomGlancy.current_filename(name), 'w') { |f| f.write '' } }
+
+    index_page = visit_index
+    new_tests_page = index_page.navigation.new_page!
+
+    assert_equal names.count, new_tests_page.files.count
+
+    new_tests_page.files.each do |file|
+      assert_includes names, file.name.text, 'filename displayed'
+    end
+
+    assert_equal names.count, Dir[File.join(DomGlancy.configuration.current_file_location, '*.yaml')].count
+    assert_equal 0,           Dir[File.join(DomGlancy.configuration.master_file_location, '*.yaml')].count
+
+    new_tests_page = new_tests_page.files.first.make_master
+    assert_equal names.count - 1, new_tests_page.files.count
+    assert_equal names.count,     Dir[File.join(DomGlancy.configuration.current_file_location, '*.yaml')].count
+    assert_equal 1,               Dir[File.join(DomGlancy.configuration.master_file_location, '*.yaml')].count
+
+    new_tests_page = new_tests_page.files.first.delete
+    assert_equal names.count - 2, new_tests_page.files.count
+    assert_equal names.count - 1, Dir[File.join(DomGlancy.configuration.current_file_location, '*.yaml')].count
+    assert_equal 1,               Dir[File.join(DomGlancy.configuration.master_file_location, '*.yaml')].count
+  end
 end

data/test/selenium_test_helper.rb

@@ -80,6 +80,16 @@ class SeleniumTestCase < Minitest::Test
     page.driver.browser.execute_script(js)
   end
 
+  def resize_about_element(add_to_width)
+    js = <<-JS
+      var element = document.getElementById('js--about');
+      var width = element.clientWidth + #{add_to_width};
+      element.style.width = width + 'px';
+    JS
+
+    page.driver.browser.execute_script(js)
+  end
+
   def add_centered_element(text_content)
     js = <<-JS
       var centeredElement = document.createElement('div');

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

@@ -2,6 +2,7 @@ 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')
+  c.similarity            = 15
 end
 
 FileUtils.mkdir_p(DomGlancy.configuration.master_file_location)

data/test/test_helper.rb

@@ -38,4 +38,6 @@ class DomGlancyTestCase < Minitest::Test
   def setup
     @dom_glancy = DomGlancy::DomGlancy.new
   end
+
+  DomGlancy.configure
 end

data/test/unit/element_test.rb

@@ -4,11 +4,14 @@ class ElementTest < DomGlancyTestCase
 
   def test_sameness
     element1 = DomGlancy::DOMElement.new(single_element_hash)
-    element2 = DomGlancy::DOMElement.new(single_element_hash.merge({"left" => 72}))
+    element2 = DomGlancy::DOMElement.new(single_element_hash.merge({'left' => 72}))
 
     assert element1.same_element?(element2), 'should be the same element'
     refute element1.all_same?(element2),     'should not be all same'
-    assert element1.close_enough?(element2), 'should be the same element, but with slight differences'
+    refute element1.close_enough?(element2), 'default similarity is 0 so not similar yet.'
+
+    element1.similarity = 15
+    assert element1.close_enough?(element2), 'default similarity is 15 now, so it is similar.'
 
     element1.left = 72
     assert element1.all_same?(element2), 'should be the same now'
@@ -19,9 +22,9 @@ class ElementTest < DomGlancyTestCase
   end
 
   def test_similarity
-    element1 = DomGlancy::DOMElement.new(single_element_hash.merge({"similarity" => 2}))
-    element2 = DomGlancy::DOMElement.new(single_element_hash.merge({"left" => 72}))
-    element3 = DomGlancy::DOMElement.new(single_element_hash.merge({"left" => 74}))
+    element1 = DomGlancy::DOMElement.new(single_element_hash.merge({'similarity' => 2}))
+    element2 = DomGlancy::DOMElement.new(single_element_hash.merge({'left' => 72}))
+    element3 = DomGlancy::DOMElement.new(single_element_hash.merge({'left' => 74}))
 
     assert element1.same_element?(element2), 'should be the same element'
     assert element1.same_element?(element3), 'should be the same element'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dom_glancy
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - geordie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-09 00:00:00.000000000 Z
+date: 2014-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler