marty_rspec 0.0.0 → 0.0.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NjMyNGU3ZTA2N2MyZmI2ZWNmMjFjY2VjMGJhNmZlNDhlMzIwMGU5Yg==
-  data.tar.gz: !binary |-
-    MDE3YzJmNjNhY2U0OTI0NGNjMGRmMjU5ZmNhZmI0YjcxNWJhYWQ3OA==
+SHA1:
+  metadata.gz: 6561535ced695e713a4c2aacb6a9e466019c2185
+  data.tar.gz: 0c034a62ed8e12a41ab5006d715a625f930ad12f
 SHA512:
-  metadata.gz: !binary |-
-    NGMxOWQxZTMwYWM5YTkzY2NlMThlMGQ5NTI5ZGRkN2Q4OTQwNDQxNDg3Mjll
-    NGU5ZWE4Njc0MGQ2NTQzZGI5OGVkYWUyN2E3NzZjNGJhOTQwYTk0ZjRiZWUx
-    YzU2ZTRmOGUxZDliYjA2MGVkNjQ5NGU4MTM2NzM0ZDg1OTY1OGY=
-  data.tar.gz: !binary |-
-    MjZlN2I0MTU0YWQ3NWM2Yzk5ZGQzNTA3OWNmMWU5OGM1NGVlZDA1MjEwMGZj
-    NzBhZWMyZDE1MDlhYTA4ZTgxYzA3ZDc2NWFjOWEwZjFjMGYxNWMzYTRmZjJi
-    NjFkYzQzODI3Y2UzNjVlOGJlODE3NzRkYmJmNWY1YjIwNjk4ODM=
+  metadata.gz: e9c19c974199c52acf44de92a9abc5f2dc83360d9b0170c0fbb46f9156f0eaf86f4792974fde6a59bfaa5453801b5d93bf8f4a37d687c1665cc5d4d3bbff281e
+  data.tar.gz: 6f7d07317c44ec96cdbc1e464cbb90a6ec93cf1e4710b703a16375721dcb68ca731ed6369d7192afa2c7528a374b71dd6df4bef80a854ed5fa4b3a6d7901c1d9

data/lib/marty_rspec/custom_matchers.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

@@ -9,6 +9,7 @@ module MartyRSpec
     class NetzkeGridNode
       include Util
       include Capybara::DSL
+      include RSpec::Matchers
 
       attr_reader :name, :grid
 
@@ -112,7 +113,7 @@ module MartyRSpec
         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('meta').associationValues['#{k}'] :
+            var value = col.assoc ? r.get('association_values')['#{k}'] :
                                     r.get('#{k}');
             if (value instanceof Date) {
               obj['#{k}'] = value.toISOString().substring(0,
@@ -130,7 +131,12 @@ module MartyRSpec
           #{js_get_fields}
           return obj;
         JS
-        wait_for_element { expect(res).to eq fields.stringify_keys }
+
+        # 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) }
       end
 
       def sorted_by? col, direction = 'asc'
@@ -140,7 +146,7 @@ module MartyRSpec
           var colValues = [];
 
           grid.getStore().each(function(r){
-            var val = col.assoc ? r.get('meta').associationValues['#{col}'] :
+            var val = col.assoc ? r.get('association_values)['#{col}'] :
                                   r.get('#{col}');
             if (val) colValues.#{direction == 'asc' ? 'push' : 'unshift'}(val);
           });
@@ -163,7 +169,11 @@ module MartyRSpec
           var store = combo.getStore();
 
           // force a retry if the store is still loading
-          if (store.loading == true) { throw "store not loaded yet"; }
+          if (store.loading == true) {
+            now = new Date().getTime();
+            while(new Date().getTime() < now + 100) { }
+            return false;
+          }
 
           for(var i = 0; i < store.getCount(); i++) {
             r.push(store.getAt(i).get('text'));

data/lib/marty_rspec/util.rb

@@ -1,4 +1,6 @@
-module MartyRSpec::Util
+module MartyRSpec
+  module Util
+    MAX_WAIT_TIME = 5.0
 
     # essentially works as documentation & wait
     def by message, level=0
@@ -80,7 +82,7 @@ module MartyRSpec::Util
     end
 
     def zoom_out
-      el = find('body')
+      el = find(:body, match: :first)
       el.native.send_keys([:control, '0'])
       el.native.send_keys([:control, '-'])
       el.native.send_keys([:control, '-'])
@@ -102,11 +104,10 @@ module MartyRSpec::Util
       res
     end
 
-    def run_js js_str, seconds_to_wait = 5.0, sleeptime = 0.1
+    def run_js js_str, seconds_to_wait = MAX_WAIT_TIME, sleeptime = 0.1
       result = wait_for_element(seconds_to_wait, sleeptime) do
-        res = nil
-        page.document.synchronize { res = page.execute_script(js_str) }
-        res.nil? ? true : res
+        page.document.synchronize { @res = page.execute_script(js_str) }
+        @res
       end
       result
     end
@@ -222,14 +223,12 @@ module MartyRSpec::Util
     end
 
     def ext_cell_val(row, col, grid, var_str = 'value')
-      # FOR NETZKE 1.0, use this line for columns
-      # r.get('association_values')['#{col}'] :
       <<-JS
       #{ext_var(grid, 'grid')}
       #{ext_var(ext_col(col, 'grid'), 'col')}
       #{ext_var(ext_row(row, 'grid'), 'row')}
       var #{var_str} = col.assoc ?
-        row.get('meta').associationValues['#{col}'] :
+        row.get('association_values')['#{col}'] :
         row.get('#{col}');
     JS
     end
@@ -284,33 +283,9 @@ module MartyRSpec::Util
       wait_for_element { !ajax_loading? }
     end
 
-    # Capybara finders
     def custom_selectors
-      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
+      # DEPRECATED: Selectors are automatically loaded now
+      warn "[DEPRECATED] no longer needed to manually load selectors"
     end
+  end
 end

data/lib/marty_rspec/version.rb

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

data/lib/marty_rspec.rb

@@ -1,4 +1,4 @@
 require 'marty_rspec/version'
 require 'marty_rspec/util'
 require 'marty_rspec/netzke_grid'
-
+require 'marty_rspec/custom_matchers'

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: marty_rspec
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.0.1
 platform: ruby
 authors:
 - Masaki Matsuo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-03 00:00:00.000000000 Z
+date: 2016-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -36,6 +36,7 @@ files:
 - README.md
 - Rakefile
 - lib/marty_rspec.rb
+- lib/marty_rspec/custom_matchers.rb
 - lib/marty_rspec/netzke_grid.rb
 - lib/marty_rspec/util.rb
 - lib/marty_rspec/version.rb
@@ -51,17 +52,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.3
+rubygems_version: 2.6.2
 signing_key: 
 specification_version: 4
 summary: RSpec helper methods for Marty