marty_rspec 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6561535ced695e713a4c2aacb6a9e466019c2185
-  data.tar.gz: 0c034a62ed8e12a41ab5006d715a625f930ad12f
+  metadata.gz: 29a66ed63853c3aaa6307a27d2e8926054d8d1ce
+  data.tar.gz: 7bd7daa4ebf6a9a609cd8a03f96adf1a65b63fa3
 SHA512:
-  metadata.gz: e9c19c974199c52acf44de92a9abc5f2dc83360d9b0170c0fbb46f9156f0eaf86f4792974fde6a59bfaa5453801b5d93bf8f4a37d687c1665cc5d4d3bbff281e
-  data.tar.gz: 6f7d07317c44ec96cdbc1e464cbb90a6ec93cf1e4710b703a16375721dcb68ca731ed6369d7192afa2c7528a374b71dd6df4bef80a854ed5fa4b3a6d7901c1d9
+  metadata.gz: e6298731dd50d8b1db4e5bee9b6f364932f66bb2cf748657ea7590885baaccc30689220f65e00045d805e7e806cf191f4dd110b185e656a9baf8fca376586462
+  data.tar.gz: 2a96e0b2aefa3368621a28f00e0e403c151d37ca4212730308b41052bc7456c6b3e28704d31a897b9fda67410b5b9cff57585431cf4bd9dcddcec5020611abb1

data/lib/marty_rspec/custom_matchers.rb

@@ -1,26 +1,10 @@
-Capybara.add_selector(:gridpanel) do
-  xpath { |name| ".//div[contains(@id, '#{name}')] | " +
-          ".//div[contains(@id, '#{name.camelize(:lower)}')]" }
+RSpec::Matchers.define :netzke_include do |expected|
+  match do |actual|
+    parsed_values = actual.each_with_object({}) do | (k, v), h |
+      h[k] = v == "False" ? false : v
+    end
+    expect(parsed_values).to include(expected.stringify_keys)
+  end
+
+  diffable
 end
-Capybara.add_selector(:msg) do
-  xpath { "//div[@id='msg-div']" }
-end
-Capybara.add_selector(:body) do
-  xpath { ".//div[@data-ref='body']" }
-end
-Capybara.add_selector(:input) do
-  xpath { |name| "//input[@name='#{name}']" }
-end
-Capybara.add_selector(:status) do
-  xpath { |name| "//div[contains(@id, 'statusbar')]//div[text()='#{name}']" }
-end
-Capybara.add_selector(:btn) do
-  xpath { |name| ".//span[text()='#{name}']" }
-end
-Capybara.add_selector(:refresh) do
-  xpath { "//img[contains(@class, 'x-tool-refresh')]" }
-end
-Capybara.add_selector(:gridcolumn) do
-  xpath { |name| ".//span[contains(@class, 'x-column-header')]" +
-          "//span[text()='#{name}']" }
-end

data/lib/marty_rspec/custom_selectors.rb

@@ -0,0 +1,26 @@
+Capybara.add_selector(:gridpanel) do
+  xpath { |name| ".//div[contains(@id, '#{name}')] | " +
+          ".//div[contains(@id, '#{name.camelize(:lower)}')]" }
+end
+Capybara.add_selector(:msg) do
+  xpath { "//div[@id='msg-div']" }
+end
+Capybara.add_selector(:body) do
+  xpath { ".//div[@data-ref='body']" }
+end
+Capybara.add_selector(:input) do
+  xpath { |name| "//input[@name='#{name}']" }
+end
+Capybara.add_selector(:status) do
+  xpath { |name| "//div[contains(@id, 'statusbar')]//div[text()='#{name}']" }
+end
+Capybara.add_selector(:btn) do
+  xpath { |name| ".//span[text()='#{name}']" }
+end
+Capybara.add_selector(:refresh) do
+  xpath { "//img[contains(@class, 'x-tool-refresh')]" }
+end
+Capybara.add_selector(:gridcolumn) do
+  xpath { |name| ".//span[contains(@class, 'x-column-header')]" +
+          "//span[text()='#{name}']" }
+end

data/lib/marty_rspec/netzke_grid.rb

@@ -1,4 +1,5 @@
 require 'capybara/dsl'
+require 'rspec/matchers'
 
 module MartyRSpec
   module NetzkeGrid
@@ -109,34 +110,20 @@ module MartyRSpec
         JS
       end
 
-      def validate_row_values row, fields
-        js_get_fields = fields.each_key.map do |k|
-          <<-JS
-            var col = Ext.ComponentQuery.query('gridcolumn[name=\"#{k}\"]', grid)[0];
-            var value = col.assoc ? r.get('association_values')['#{k}'] :
-                                    r.get('#{k}');
-            if (value instanceof Date) {
-              obj['#{k}'] = value.toISOString().substring(0,
-                value.toISOString().indexOf('T'));
-            } else {
-              obj['#{k}'] = value;
-            };
-          JS
-        end.join
-
+      def get_row_vals row
         res = run_js <<-JS
           #{ext_var(grid, 'grid')}
-          #{ext_var(ext_row(row.to_i - 1, 'grid'), 'r')}
-          var obj = {};
-          #{js_get_fields}
-          return obj;
+          return #{ext_row(row.to_i - 1, 'grid')}.data;
         JS
+      end
 
+      def validate_row_values row, fields
+        res = get_row_vals(row)
         # in netzke 1.0, "False" becomes false
-        expected_value = fields.each_with_object({}) do | (k, v), h |
-          h[k.to_s] = v == "False" ? false : v
-        end
-        wait_for_element { expect(res).to eq(expected_value) }
+        # DEPRECATED: use custom matcher :have_netzke_fields, as below
+        warn "[DEPRECATED] use expect(<<GRID OBJECT>>.get_row_vals(#{row}))." +
+             "to netzke_include(#{fields})"
+        wait_for_element { expect(res).to netzke_include(fields) }
       end
 
       def sorted_by? col, direction = 'asc'
@@ -146,7 +133,7 @@ module MartyRSpec
           var colValues = [];
 
           grid.getStore().each(function(r){
-            var val = col.assoc ? r.get('association_values)['#{col}'] :
+            var val = col.assoc ? r.get('association_values')['#{col}'] :
                                   r.get('#{col}');
             if (val) colValues.#{direction == 'asc' ? 'push' : 'unshift'}(val);
           });

data/lib/marty_rspec/version.rb

@@ -1,3 +1,3 @@
 module MartyRSpec
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/lib/marty_rspec.rb

@@ -2,3 +2,4 @@ require 'marty_rspec/version'
 require 'marty_rspec/util'
 require 'marty_rspec/netzke_grid'
 require 'marty_rspec/custom_matchers'
+require 'marty_rspec/custom_selectors'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: marty_rspec
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Masaki Matsuo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-23 00:00:00.000000000 Z
+date: 2016-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -37,6 +37,7 @@ files:
 - Rakefile
 - lib/marty_rspec.rb
 - lib/marty_rspec/custom_matchers.rb
+- lib/marty_rspec/custom_selectors.rb
 - lib/marty_rspec/netzke_grid.rb
 - lib/marty_rspec/util.rb
 - lib/marty_rspec/version.rb