capybara-select-2 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f31200b3f8f18c77f09f9e50d37337678d65f249
-  data.tar.gz: 9dfd0e03e4708f0e601e217a989a5162c924b370
+  metadata.gz: 1270129638518b209d629a987b5998c6e80ee997
+  data.tar.gz: b8681b7193f7b789d5c900115474007103fb819c
 SHA512:
-  metadata.gz: 6021c4c6707b822f7a9cef51ccd97357d886a6c33176fa6e36a8fb25e9df78a673415abd4983a51d536dee703c048de41a46069bc263b0ce8e8356883b67b2db
-  data.tar.gz: e220e4c3ffbfa5e3dc00d7e837d00e5d4b17764bf90d4eecc20ca017bb18752441ad074ae3067def35231fa8783d0c2ce8a52bda8615481ae2c9203b6041d287
+  metadata.gz: b7b8e06ff700058b083008769bc926d50c0fe24aacfc5507736c7eff9f099f9185f3dcd36acb93d171e60234d727d2ca32ee848a850f46e578d4d652536ab30c
+  data.tar.gz: 6bb11c66346bd4b26d5416548c74939c16013d26b40cd41bd7ecb1d009b5d9fadcdb4f3dff463b2ab20a3c2c8e8e84e9a2371b2ae2737f09530854fe5cd412ef

data/.travis.yml

@@ -1,3 +1,5 @@
+sudo: required
+dist: trusty
 language: ruby
 rvm:
   - 2.4.2
@@ -6,3 +8,16 @@ env:
   - MOZ_HEADLESS=1
 addons:
   firefox: latest
+  apt:
+    sources:
+      - ubuntu-sdk-team
+    packages:
+      - libqt5webkit5-dev
+      - qtdeclarative5-dev
+before_install:
+  - export GECKODRIVER_VERSION=0.21.0
+  - 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
+script: xvfb-run bundle exec rspec

data/README.md

@@ -1,5 +1,5 @@
 # CapybaraSelect2 for select2 version 2/3/4
-!!! For select2 versions 2 and 3 you need to specify which version you are using. See [Configuration](https://github.com/Hirurg103/capybara_select2#configuration)
+!!! CapybaraSelect2 detects version select2 automatically
 
 [![Build Status](https://travis-ci.org/Hirurg103/capybara_select2.svg?branch=master)](https://travis-ci.org/Hirurg103/capybara_select2)
 
@@ -41,20 +41,6 @@ In your env.rb
 World CapybaraSelect2
 ```
 
-## Configuration
-
-CapybaraSelect2 expects select2 version 4 by default. If you are using version 3 or 2 please specify it in your spec helper
-
-```ruby
-CapybaraSelect2::Config.select2_version = 3
-
-# or
-
-CapybaraSelect2.configure do |config|
-  config.select2_version = 3
-end
-```
-
 ## Usage
 
 ### Select from a node containing select2 control
@@ -84,6 +70,11 @@ select2 'Buy Milk', from: 'Things to do', search: true
 select2 'Millennials', from: 'Generations', tag: true
 ```
 
+### Select several options at once
+```ruby
+select2 'Buy Milk', 'Go to gym', css: '#todo'
+```
+
 ## Contributing
 
 1. Add a test case which covers the bug

data/capybara_select2.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   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", "~> 2.53"
+  spec.add_development_dependency "selenium-webdriver", "~> 3.5"
   spec.add_development_dependency "capybara-screenshot" , "~> 1.0"
   spec.add_development_dependency "capybara-webkit", "~> 1.15"
   spec.add_development_dependency "puma", "~> 3.12"

data/lib/capybara_select2.rb

@@ -1,6 +1,5 @@
 require "capybara_select2/version"
 require 'capybara_select2/helpers'
-require 'capybara_select2/config'
 
 module CapybaraSelect2
   include Helpers

data/lib/capybara_select2/helpers.rb

@@ -1,43 +1,59 @@
+require 'capybara_select2/utils'
+
 module CapybaraSelect2
   module Helpers
-    def select2(value, options = {})
-      version = Config.select2_version.to_s
+
+    def select2(*args)
+      options = args.pop
+      values = args
+
+      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
+
+      version = Utils.detect_version(container)
 
       open_select = {
         '2' => ".select2-choice, .select2-search-field",
         '3' => ".select2-choice, .select2-search-field",
         '4' => ".select2-selection"
-      }[version]
+      }.fetch(version)
 
       search_input = {
         '2' => ".select2-dropdown-open input.select2-focused",
         '3' => ".select2-dropdown-open input.select2-input",
         '4' => ".select2-container--open input.select2-search__field"
-      }[version]
+      }.fetch(version)
 
       option = {
         '2' => ".select2-container-active .select2-result",
         '3' => ".select2-drop-active .select2-result",
         '4' => ".select2-results .select2-results__option"
-      }[version]
+      }.fetch(version)
 
-      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
+      values.each do |value|
+        container.find(open_select).click
 
-      container.find(open_select).click
+        if options[:search] || options[:tag]
+          find(search_input).set value
+        end
 
-      if options[:search] || options[:tag]
-        find(search_input).set value
+        find(:xpath, '//body').find(option, text: value).click
       end
-
-      find(:xpath, '//body').find(option, text: value).click
     end
 
   end

data/lib/capybara_select2/utils.rb

@@ -0,0 +1,21 @@
+module CapybaraSelect2
+  module Utils
+
+    def self.detect_version(container)
+      if container['class'] =~ /^select2\s/
+        '4'
+      elsif container['id'] =~ /^s2id_/
+        '3'
+      else
+        '2'
+      end
+    end
+
+    def self.validate_options!(options)
+      unless options.is_a?(Hash) && [:css, :xpath, :from].any? { |k| options.key?(k) }
+        fail ArgumentError.new("Please specify :css, :xpath or :from in options")
+      end
+    end
+
+  end
+end

data/lib/capybara_select2/version.rb

@@ -1,3 +1,3 @@
 module CapybaraSelect2
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara-select-2
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Dzmitry Kavalionak
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.53'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.53'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: capybara-screenshot
   requirement: !ruby/object:Gem::Requirement
@@ -156,8 +156,8 @@ files:
 - capybara_select2.gemspec
 - lib/capybara-select-2.rb
 - lib/capybara_select2.rb
-- lib/capybara_select2/config.rb
 - lib/capybara_select2/helpers.rb
+- lib/capybara_select2/utils.rb
 - lib/capybara_select2/version.rb
 homepage: https://github.com/Hirurg103/capybara_select2
 licenses:

data/lib/capybara_select2/config.rb

@@ -1,15 +0,0 @@
-module CapybaraSelect2
-
-  def self.configure
-    yield Config
-  end
-
-  class Config
-    class << self
-      attr_accessor :select2_version
-    end
-  end
-
-  Config.select2_version ||= 4
-
-end