softwear-lib 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e9e5faa264baae9709c7aa3e617385ae064b4b3
-  data.tar.gz: 1176a7fad8ce213844ed4b1546360e941eae7cf2
+  metadata.gz: 4ac2c8d7b7161999addf91016caab6f44f3b4dad
+  data.tar.gz: 9d2b1bd4545bcbf451dbc73297a346baf6073bf9
 SHA512:
-  metadata.gz: 1a556e2889c49055add5ad93f1d0cd875254163d970235b1a1ce764dc04bf8b0a7775cae352683265ff8d9ed587cea9f33a64fa31e6229ace080a74fc2243359
-  data.tar.gz: 9d31ab2998d6934f7b9f36b070eed84df8b822a8b1ae2822d3a5447b1c741b38c41ba2b3f97b8c0792e9ddf2bd45e5b38c23aa4ddbfe834eff1b89dcc50a97c1
+  metadata.gz: 3c688a01c3e57392e957a1aca79910fd7e80e274af1ba3ca62cfb9df06bc5a55b1b98a52f27b99149ec90659e51d968afb64b1842b70a6ae5e17b804d271192c
+  data.tar.gz: 416b4b8ab059bf372c23a02430864e5842661bb4e52d15fd23be1bce90295186bba1082911d290d045ba13d4ff04a8025361a10bd489d1567d99686a6fc10263

data/lib/softwear/lib/spec.rb

@@ -44,6 +44,50 @@ module Softwear::Lib
         # Restore existing default
         page.evaluate_script('window.confirm = function() { return true; }')
       end
+
+      def eventually_fill_in(field, options={})
+        page.should have_css('#' + field)
+        fill_in field, options
+      end
+
+      def within_row(num, &block)
+        if RSpec.current_example.metadata[:js]
+          within("table.index tbody tr:nth-child(#{num})", &block)
+        else
+          within(:xpath, all('table.index tbody tr')[num-1].path, &block)
+        end
+      end
+
+      def column_text(num)
+        if RSpec.current_example.metadata[:js]
+          find("td:nth-child(#{num})").text
+        else
+          all('td')[num-1].text
+        end
+      end
+
+      def find_label_by_text(text)
+        label = find_label(text)
+        counter = 0
+
+        # Because JavaScript testing is prone to errors...
+        while label.nil? && counter < 10
+          sleep(1)
+          counter += 1
+          label = find_label(text)
+        end
+
+        if label.nil?
+          raise "Could not find label by text #{text}"
+        end
+
+        label
+      end
+
+      def find_label(text)
+        first(:xpath, "//label[text()[contains(.,'#{text}')]]")
+      end
+
     end
 
     module Select2
@@ -65,7 +109,7 @@ module Softwear::Lib
         select_select2_result(value)
       end
 
-      def nonfunctional_select2(value, options)
+      def select2(value, options)
         label = find_label_by_text(options[:from])
 
         within label.first(:xpath,'.//..') do

data/lib/softwear/lib/version.rb

@@ -1,5 +1,5 @@
 module Softwear
   module Lib
-    VERSION = "0.0.16"
+    VERSION = "0.0.17"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: softwear-lib
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - Nigel Baillie