decidim-dev 0.11.0.pre1 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9171c34e3282c88b4b8e0748a97343f388437a64629b80acf91432264d0709b1
-  data.tar.gz: 1fc4489eb4a2cf79f143e7d43be039d567d1f38e3f2294634c218120bee1f376
+  metadata.gz: f1aecf93329cc872b1ec4be35eaf6b4c4bb43e08443aabd28b97f02e4b525719
+  data.tar.gz: 65d9e292404309eda93c0ac388a8d0256936f3ca75c010e0693cde78e51de9b8
 SHA512:
-  metadata.gz: d777634bde596747205583c0ff2a388ae95025f62556fb65cadb748fe440df6505043725bbe7fcd391fd311c8066fd40aa357f0984bee99fc076072ab966198b
-  data.tar.gz: a3760dc6059796ec870bcb3b2189d95f217d1b8820909aca0027f74eb41af51c6a85c4eddd9fba18830f18b754ae1a49fe207b5d29c1cf99205db224cbdb8df9
+  metadata.gz: 33a502b3255a9545127ec36f1dfa569525502f7b2bc61b22f748b5f6da19dda6903be9711e859950319fdbf6bd96a00887be64ef4ee4229f78370df235de556b
+  data.tar.gz: 48523bdb8c91471233b16bf4c28e1d4cd1388a50436d68790c42fee96cc23c4a1694e60fe676e30c596450185f2c8f6d76717303795d5e7251976426649e677f

data/lib/decidim/dev/test/rspec_support/capybara_data_picker.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Capybara
+  module DataPicker
+    def select_data_picker(id, multiple: nil, global_value: "")
+      Struct.new(:data_picker, :global_value).new(find_data_picker(id, multiple: multiple), global_value)
+    end
+
+    private
+
+    def find_data_picker(id, multiple: nil)
+      if multiple.nil?
+        expect(page).to have_selector("div.data-picker##{id}")
+      else
+        expect(page).to have_selector("div.data-picker.picker-#{multiple ? "multiple" : "single"}##{id}")
+      end
+      find("div.data-picker##{id}")
+    end
+
+    def data_picker_pick_current
+      body = find(:xpath, "//body")
+      expect(body).to have_selector("#data_picker-modal .picker-footer a[data-picker-choose]")
+      body.find("#data_picker-modal .picker-footer a[data-picker-choose]").click
+    end
+  end
+end

data/lib/decidim/dev/test/rspec_support/capybara_proposals_picker.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require_relative "capybara_data_picker"
+
+module Capybara
+  module ProposalsPicker
+    include DataPicker
+
+    RSpec::Matchers.define :have_data_picked do |expected, text|
+      match do |data_picker|
+        data_picker_elem = data_picker.data_picker
+        expect(data_picker_elem).to have_selector(".picker-values div input[value='#{expected&.id || data_picker.global_value}']", visible: false)
+        expect(data_picker_elem).to have_selector(:xpath, "//div[contains(@class,'picker-values')]/div/a[text()[contains(.,'#{text}')]]")
+      end
+    end
+
+    def proposal_pick(proposal_picker, proposal)
+      data_picker = proposal_picker.data_picker
+      # use scope_repick to change single scope picker selected scope
+      expect(data_picker).to have_selector(".picker-values:empty", visible: false) if data_picker.has_css?(".picker-single")
+
+      expect(data_picker).to have_selector(".picker-prompt")
+      data_picker.find(".picker-prompt").click
+
+      proposal_picker_search_perform(proposal.title)
+      proposal_picker_search_choose_result(proposal.id)
+      data_picker_pick_current
+
+      expect(proposal_picker).to have_data_picked(proposal, proposal.title)
+    end
+
+    private
+
+    def proposal_picker_search_perform(term)
+      body = find(:xpath, "//body")
+      input_selector = "#data_picker-modal .picker-content input#data_picker-autocomplete"
+      expect(body).to have_selector(input_selector)
+      body.find("#data_picker-modal .picker-content").fill_in("data_picker-autocomplete", with: term)
+    end
+
+    def proposal_picker_search_choose_result(proposal_id)
+      body = find(:xpath, "//body")
+      expect(body).to have_selector(".autocomplete-suggestions .autocomplete-suggestion")
+      body.find(".autocomplete-suggestions div.autocomplete-suggestion[data-model-id='#{proposal_id}']").click
+    end
+  end
+end
+
+RSpec.configure do |config|
+  config.include Capybara::ProposalsPicker, type: :system
+end

data/lib/decidim/dev/test/rspec_support/capybara_scopes_picker.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
+require_relative "capybara_data_picker"
+
 module Capybara
   module ScopesPicker
-    def scopes_picker_find(id, multiple: nil, global_value: "")
-      Struct.new(:data_picker, :global_value).new(data_picker_find(id, multiple: multiple), global_value)
-    end
+    include DataPicker
 
     RSpec::Matchers.define :have_scope_picked do |expected|
       match do |scope_picker|
@@ -33,7 +33,7 @@ module Capybara
       data_picker.find(".picker-prompt").click
 
       scope_picker_browse_scopes(scope.part_of_scopes) if scope
-      scope_picker_pick_current
+      data_picker_pick_current
 
       expect(scope_picker).to have_scope_picked(scope)
     end
@@ -49,7 +49,7 @@ module Capybara
 
       scope_picker_browse_scope(parent_scope, back: true)
       scope_picker_browse_scopes(new_scope.part_of_scopes - old_scope.part_of_scopes)
-      scope_picker_pick_current
+      data_picker_pick_current
 
       expect(scope_picker).to have_scope_picked(new_scope)
     end
@@ -65,15 +65,6 @@ module Capybara
 
     private
 
-    def data_picker_find(id, multiple: nil)
-      if multiple.nil?
-        expect(page).to have_selector("div.data-picker##{id}")
-      else
-        expect(page).to have_selector("div.data-picker.picker-#{multiple ? "multiple" : "single"}##{id}")
-      end
-      find("div.data-picker##{id}")
-    end
-
     def scope_picker_browse_scopes(scopes)
       scopes.each do |scope|
         scope_picker_browse_scope(scope)
@@ -87,12 +78,6 @@ module Capybara
       expect(body).to have_selector("#data_picker-modal .picker-#{where} a", text: scope_name)
       body.find("#data_picker-modal .picker-#{where} a", text: scope_name).click
     end
-
-    def scope_picker_pick_current
-      body = find(:xpath, "//body")
-      expect(body).to have_selector("#data_picker-modal .picker-footer a[data-picker-choose]")
-      body.find("#data_picker-modal .picker-footer a[data-picker-choose]").click
-    end
   end
 end
 

data/lib/decidim/dev/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-dev version.
   module Dev
     def self.version
-      "0.11.0.pre1"
+      "0.11.1"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-dev
 version: !ruby/object:Gem::Version
-  version: 0.11.0.pre1
+  version: 0.11.1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-26 00:00:00.000000000 Z
+date: 2018-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -32,14 +32,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.0.pre1
+        version: 0.11.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.0.pre1
+        version: 0.11.1
 - !ruby/object:Gem::Dependency
   name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
@@ -337,6 +337,8 @@ files:
 - lib/decidim/dev/test/rspec_support/attachments.rb
 - lib/decidim/dev/test/rspec_support/authorization.rb
 - lib/decidim/dev/test/rspec_support/capybara.rb
+- lib/decidim/dev/test/rspec_support/capybara_data_picker.rb
+- lib/decidim/dev/test/rspec_support/capybara_proposals_picker.rb
 - lib/decidim/dev/test/rspec_support/capybara_scopes_picker.rb
 - lib/decidim/dev/test/rspec_support/comments.rb
 - lib/decidim/dev/test/rspec_support/component.rb
@@ -371,9 +373,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.3