capybara-select-2 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9c02febc86ceac19a3366ae2bb0dd3417ddb25d6
-  data.tar.gz: 85d0b6341fae40363b18d0876eda448f53fcfb0b
+SHA256:
+  metadata.gz: 01f1574cc4400755884d066349b52d23174b5b61634c9baff7e5332e83687654
+  data.tar.gz: 5614b845dc929345d9463b7e9de2fdebe483071b5423ff5b0a376add3ac08e5d
 SHA512:
-  metadata.gz: a4c1f2cc1aa7a694793c895ac13770db970136b7fb60850cff6a2d88b42431e698797361d4a117fa4f63f0fadb08dc5b1c40670fa44e011a3f6e3b93422cb57b
-  data.tar.gz: 6079eabfdd1a923f3ec29089d45e02a91dc3e9405d418753c4f3aedec817e8e3cbbea1e9e1330b010797df5687f1bda266fc64548d48cd9e571230dcbe157ee5
+  metadata.gz: 7ebe35a60da59411376f3e473d479fde65b05bd1186caef104b8745564fc5afbe21815bd1f0504a83cb1ba3bd15ae4ead119d4182af5978be9341f5b1591cc61
+  data.tar.gz: 0cd9d2747b433bbdefd1ad926dbddb35f0790ae10a48206666dc43441a3ab3fd3d7afb03ca2816062972c1c3a6e37dcf1a4ed6858dab95ddefa56f045153f235

data/.gitlab-ci.yml

@@ -0,0 +1,19 @@
+image: ruby:2.4.3
+
+variables:
+  MIN_CHROMEDRIVER_VER: '2.44'
+  MIN_CHROME_VER: '70'
+  TMPDIR: '/tmp'
+
+before_script:
+- echo $HOME
+- chmod +x ./ci/install-chromedriver && ./ci/install-chromedriver
+- chmod +x ./ci/install-chrome && ./ci/install-chrome
+- echo $PATH
+- echo `which chromedriver`
+- gem install bundler --no-ri --no-rdoc
+- bundle install
+
+test:
+  script:
+    - rspec spec

data/.ruby-version

@@ -0,0 +1 @@
+2.4.1

data/.travis.yml

@@ -2,30 +2,19 @@ sudo: required
 dist: trusty
 language: ruby
 rvm:
-  - 2.4.2
-before_install: gem install bundler -v 1.16.4
+  - 2.4.1
+before_install: gem install bundler -v 2.0.1
 env:
   global:
-    - MOZ_HEADLESS=1
     - CC_TEST_REPORTER_ID=e82aca58fe4e7eae020799b830f8df7dd35ec67f7476078d4fe97ae884be8f84
-    - GECKODRIVER_VERSION=0.21.0
 addons:
-  firefox: latest
-  apt:
-    sources:
-      - ubuntu-sdk-team
-    packages:
-      - libqt5webkit5-dev
-      - qtdeclarative5-dev
-before_install:
-  - wget https://github.com/mozilla/geckodriver/releases/download/v$GECKODRIVER_VERSION/geckodriver-v$GECKODRIVER_VERSION-linux64.tar.gz
-  - mkdir geckodriver
-  - tar -xzf geckodriver-v$GECKODRIVER_VERSION-linux64.tar.gz -C geckodriver
-  - export PATH=$PATH:$PWD/geckodriver
+  chrome: stable
 before_script:
   - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-  - chmod +x ./cc-test-reporter
-  - ./cc-test-reporter before-build
+  - chmod +x ./cc-test-reporter && ./cc-test-reporter before-build
+  - # start your web application and listen on `localhost`
+  - google-chrome-stable --headless --disable-gpu --remote-debugging-port=9222 http://localhost &
+
 script: COVERAGE=1 xvfb-run bundle exec rspec
 after_script:
   - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT

data/README.md

@@ -77,6 +77,15 @@ select2 'Millennials', from: 'Generations', tag: true
 select2 'Buy Milk', 'Go to gym', css: '#todo'
 ```
 
+### Add match strategy in case of ambiguous results
+```ruby
+select2 'Buy Milk', from: 'Things to do', search: true, match: :first
+```
+
+### Check for select2 option on the page
+```ruby
+expect(page).to have_select2_option('Buy Milk')
+```
 ## Contributing
 
 1. Add a test case which covers the bug

data/capybara_select2.gemspec

@@ -26,13 +26,13 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.11"
+  spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "capybara", "~> 3.5"
-  spec.add_development_dependency "selenium-webdriver", "~> 3.5"
+  spec.add_development_dependency "capybara", "~> 3.12"
+  spec.add_development_dependency "chromedriver-helper", "~> 2.1"
+  spec.add_development_dependency "selenium-webdriver", "~> 3.141.0"
   spec.add_development_dependency "capybara-screenshot" , "~> 1.0"
-  spec.add_development_dependency "capybara-webkit", "~> 1.15"
   spec.add_development_dependency "puma", "~> 3.12"
   spec.add_development_dependency "pry", "~> 0.11.0"
   spec.add_development_dependency "simplecov", "~> 0.16"

data/ci/install-chrome

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -xe
+wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -
+echo "deb http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google.list
+
+# Update packages
+apt-get update -yqqq
+
+# Install Chrome browser
+apt-get install -y google-chrome-stable

data/ci/install-chromedriver

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+set -xe
+
+# Update packages
+apt-get update -yqqq
+
+# Install Chrome browser
+apt-get install -y unzip
+
+# Install/use specific version of chrome if an installed version is lower
+install_chromedriver() {
+  wget -O $TMPDIR/chromedriver.zip https://chromedriver.storage.googleapis.com/${MIN_CHROMEDRIVER_VER}/chromedriver_linux64.zip
+  mkdir -p $HOME/.chromedriver
+  (cd $HOME/.chromedriver && unzip $TMPDIR/chromedriver.zip && chmod +x chromedriver)
+  rm -f $TMPDIR/chromedriver.zip
+  ln -s $HOME/.chromedriver/chromedriver /usr/local/bin/chromedriver
+}
+if ! which chromedriver; then
+  install_chromedriver
+elif dpkg --compare-versions `chromedriver --version | cut -d " " -f2` lt $MIN_CHROMEDRIVER_VER; then
+  install_chromedriver
+fi

data/lib/capybara_select2.rb

@@ -7,6 +7,7 @@ end
 
 if defined?(RSpec)
   require 'rspec/core'
+  require 'capybara_select2/rspec/matchers'
 
   RSpec.configure do |config|
     config.include CapybaraSelect2

data/lib/capybara_select2/helpers.rb

@@ -9,51 +9,23 @@ module CapybaraSelect2
 
       Utils.validate_options!(options)
 
-      container = if options[:xpath]
-        find(:xpath, options[:xpath])
-      elsif options[:css]
-        find(:css, options[:css])
-      else
-        find("label:not(.select2-offscreen)", text: options[:from])
-          .find(:xpath, '..')
-          .find('.select2-container')
-      end
-
-      container = if container['class'] =~ /select2-container/
-        container
-      else
-        container.find('.select2-container')
-      end
-
-      select2_version = Utils.detect_select2_version(container)
-
-      open_select = {
-        '2' => ".select2-choice, .select2-search-field",
-        '3' => ".select2-choice, .select2-search-field",
-        '4' => ".select2-selection"
-      }.fetch(select2_version)
-
-      search_input = {
-        '2' => ".select2-dropdown-open input.select2-focused",
-        '3' => ".select2-drop-active input.select2-input," +          # single
-               ".select2-dropdown-open input.select2-input",          # multi
-        '4' => ".select2-container--open input.select2-search__field"
-      }.fetch(select2_version)
+      select2_container = Utils.find_select2_container(options, page)
+      select2_version = Utils.detect_select2_version(select2_container)
 
-      option = {
-        '2' => ".select2-container-active .select2-result",
-        '3' => ".select2-drop-active .select2-result",
-        '4' => ".select2-results .select2-results__option[role='treeitem']"
-      }.fetch(select2_version)
+      opener_selector = Selectors.opener_selector(select2_version)
+      option_selector = Selectors.option_selector(select2_version)
 
       values.each do |value|
-        container.find(open_select).click
+        select2_container.find(:css, opener_selector).click
 
         if options[:search] || options[:tag]
-          find(:xpath, '//body').find(search_input).set value
+          search_input_selector = Selectors.search_input_selector(select2_version)
+          find(:xpath, '//body').find(:css, search_input_selector).set value
         end
 
-        find(:xpath, '//body').find(option, text: value).click
+        find_options = { text: value }
+        find_options[:match] = options[:match] if options[:match]
+        find(:xpath, '//body').find(:css, option_selector, find_options).click
       end
     end
 

data/lib/capybara_select2/rspec/matchers.rb

@@ -0,0 +1,20 @@
+require 'rspec/expectations'
+require 'capybara_select2/selectors'
+
+RSpec::Matchers.define :have_select2_option do |expected|
+  def option_matcher(element)
+    select2_container = element.find('.select2-container', match: :first)
+
+    select2_version = CapybaraSelect2::Utils.detect_select2_version(select2_container)
+
+    CapybaraSelect2::Selectors.option_selector(select2_version)
+  end
+
+  match do |element|
+    expect(element).to have_css option_matcher(element), text: expected
+  end
+
+  match_when_negated do |element|
+    expect(element).not_to have_css option_matcher(element), text: expected
+  end
+end

data/lib/capybara_select2/selectors.rb

@@ -0,0 +1,38 @@
+module CapybaraSelect2
+  module Selectors
+
+    module_function
+
+    OpenerSelectors = {
+      '2' => ".select2-choice, .select2-search-field",
+      '3' => ".select2-choice, .select2-search-field",
+      '4' => ".select2-selection"
+    }.freeze
+
+    def opener_selector(select2_version)
+      OpenerSelectors.fetch(select2_version)
+    end
+
+    SearchInputSelectors = {
+      '2' => ".select2-dropdown-open input.select2-focused",
+      '3' => ".select2-drop-active input.select2-input," +          # single
+             ".select2-dropdown-open input.select2-input",          # multi
+      '4' => ".select2-container--open input.select2-search__field"
+    }.freeze
+
+    def search_input_selector(select2_version)
+      SearchInputSelectors.fetch(select2_version)
+    end
+
+    OptionSelectors = {
+      '2' => ".select2-container-active .select2-result",
+      '3' => ".select2-drop-active .select2-result",
+      '4' => ".select2-results .select2-results__option[role='treeitem']"
+    }.freeze
+
+    def option_selector(select2_version)
+      OptionSelectors.fetch(select2_version)
+    end
+
+  end
+end

data/lib/capybara_select2/utils.rb

@@ -17,5 +17,23 @@ module CapybaraSelect2
       end
     end
 
+    def self.find_select2_container(options, page)
+      container = if options[:xpath]
+        page.find(:xpath, options[:xpath])
+      elsif options[:css]
+        page.find(:css, options[:css])
+      else
+        page.find(:css, "label:not(.select2-offscreen)", text: options[:from])
+          .find(:xpath, '..')
+          .find(:css, '.select2-container')
+      end
+
+      if container['class'] =~ /select2-container/
+        container
+      else
+        container.find(:css, '.select2-container')
+      end
+    end
+
   end
 end

data/lib/capybara_select2/version.rb

@@ -1,3 +1,3 @@
 module CapybaraSelect2
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capybara-select-2
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Dzmitry Kavalionak
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-19 00:00:00.000000000 Z
+date: 2019-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -58,56 +58,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.12'
 - !ruby/object:Gem::Dependency
-  name: selenium-webdriver
+  name: chromedriver-helper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: capybara-screenshot
+  name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 3.141.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 3.141.0
 - !ruby/object:Gem::Dependency
-  name: capybara-webkit
+  name: capybara-screenshot
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
@@ -158,7 +158,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".gitlab-ci.yml"
 - ".rspec"
+- ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - LICENSE
@@ -168,9 +170,13 @@ files:
 - bin/console
 - bin/setup
 - capybara_select2.gemspec
+- ci/install-chrome
+- ci/install-chromedriver
 - lib/capybara-select-2.rb
 - lib/capybara_select2.rb
 - lib/capybara_select2/helpers.rb
+- lib/capybara_select2/rspec/matchers.rb
+- lib/capybara_select2/selectors.rb
 - lib/capybara_select2/utils.rb
 - lib/capybara_select2/version.rb
 homepage: https://github.com/Hirurg103/capybara_select2
@@ -193,8 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Capybara helpers for https://select2.org select box (supports Select2 versions