Merge pull request #16 from msx2/selector-refatoring

Selector refatoring
msx2 · Sep 27, 2015 · 5afe8c0 · 5afe8c0
2 parents 44ae1e2 + e4d1a29
commit 5afe8c0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/lib/selectivity/rails/version.rb b/lib/selectivity/rails/version.rb
@@ -1,5 +1,5 @@
 module Selectivity
  module Rails
- VERSION = '0.1.5'
+ VERSION = '0.1.6'
  end
 end
diff --git a/lib/selectivity/rspec.rb b/lib/selectivity/rspec.rb
@@ -52,7 +52,13 @@ def _selectivity_select!(input, item)
  input.click
 
  within 'div.selectivity-dropdown' do
- if find('div.selectivity-result-item', text: item).visible?
+ element = if page.driver.class.name =~ /poltergeist/i
+ find('div.selectivity-result-item', text: item)
+ else
+ find(:xpath, "//div[@class='selectivity-result-item'][contains(text(), '#{item}')]")
+ end
+
+ if element.visible?
  page.evaluate_script("$('div.selectivity-result-item:contains(#{item})').trigger('click')")
  end
  end