softwear-lib 1.3.13 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b1f4276e4fb33b20f7d84a98b0c6a7dc2a831cd
-  data.tar.gz: 9c39b81dc8c6743b0a784a22822dba4eda82f657
+  metadata.gz: 796a34ecd1ab8a9df7114dda0eff8887a4862771
+  data.tar.gz: a7340a19f5bb73d05587084bd6a10402c6257908
 SHA512:
-  metadata.gz: a764e96e8b481a9d48c02f3611b57ef6d91978471fd9dd48c5faf7618780933451baa96632bcee27c33daed8339b144f7606f75b71526b93526c948d1bd1dabd
-  data.tar.gz: b355f311c2be574a7077087ab15b2d0fe05277f8d05341e0564ed179ec90db3c96408140f67a5201694a7db5e79f5e72c5bbc68907dcdef0577fa7819e5225c1
+  metadata.gz: e302e491ccb7c3d8ef64305dfa68ff3f95e9af84624bfc94d2671b950ad2368c6d24525722803d3a8461b40bbe339cc3e07aa7a71f814fd62e609e1829001df0
+  data.tar.gz: aa09921516bdae126c684859ea9127e95901210c8070c80fae8e07bb2871f7068b279bd1ac32652bb51392b5071ebed4a8604ed8f12ab295c7b034c4b5cae851

data/lib/softwear/lib/spec.rb

@@ -66,18 +66,11 @@ module Softwear::Lib
         end
       end
 
-      def find_label_by_text(text)
+      def find_label_by_text(text, options = {})
         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?
+        if !options[:try] && label.nil?
           raise "Could not find label by text #{text}"
         end
 
@@ -91,73 +84,17 @@ module Softwear::Lib
     end
 
     module Select2
-      def set_select2_field(field, value)
-        page.execute_script %Q{$('#{field}').select2('val', '#{value}')}
-      end
-
-      def select2_search(value, options)
-        label = find_label_by_text(options[:from])
-        within label.first(:xpath,'.//..') do
-          options[:from] = "##{find('.select2-container')['id']}"
-        end
-        targetted_select2_search(value, options)
-      end
-
-      def targetted_select2_search(value, options)
-        page.execute_script %Q{$('#{options[:from]}').select2('open')}
-        page.execute_script "$('#{options[:dropdown_css]} input.select2-input').val('#{value}').trigger('keyup-change');"
-        select_select2_result(value)
-      end
-
-      def select2(value, options)
-        label = find_label_by_text(options[:from])
-
-        within label.first(:xpath,'.//..') do
-          options[:from] = "##{find('.select2-container')['id']}"
-        end
-        targetted_select2(value, options)
-      end
-
-      def nogood_select2(value, from)
-        label = find_label_by_text(from[:from])
-
-        select2_container = nil
-        within label.first(:xpath,'.//..') do
-          select2_container = find('.select2-container')
+      def select2(text, options)
+        label = find_label_by_text(options[:from], try: true)
+        if label
+          selector = "select[name='#{label['for']}']"
+        else
+          selector = options[:from]
         end
 
-        select2_container.find(".select2-choice").click
-
-        find(:xpath, "//body").find("input.select2-input").set(value)
-        page.execute_script(%|$("input.select2-input:visible").keyup();|)
-        drop_container = ".select2-results"
-        find(:xpath, "//body").find("#{drop_container} li", text: value).click
-      end
-
-
-      def select2_no_label value, options={}
-        raise "Must pass a hash containing 'from'" if not options.is_a?(Hash) or not options.has_key?(:from)
-
-        placeholder = options[:from]
-        # TODO: still need this?
-        # minlength = options[:minlength] || 4
-
-        click_link placeholder
-
-        select_select2_result(value)
-      end
-
-      def targetted_select2(value, options)
-        # find select2 element and click it
-        find(options[:from]).find('a').click
-        select_select2_result(value)
-      end
-
-      def select_select2_result(value)
-        # results are in a div appended to the end of the document
-        within(:xpath, '//body') do
-          page.find('div.select2-result-label', text: %r{#{Regexp.escape(value)}}i).click
-        end
+        find("#{selector}+span").click
+        find('input.select2-search__field').set(text)
+        first('li.select2-results__option').click
       end
     end
 

data/lib/softwear/lib/version.rb

@@ -1,5 +1,5 @@
 module Softwear
   module Lib
-    VERSION = "1.3.13"
+    VERSION = "1.4.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: softwear-lib
 version: !ruby/object:Gem::Version
-  version: 1.3.13
+  version: 1.4.0
 platform: ruby
 authors:
 - Nigel Baillie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-04 00:00:00.000000000 Z
+date: 2016-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler