test: proposals picker test helpers updated & moved to proposals module

leio10 · leio10 · commit 4f070a8732cd · 2020-03-20T10:50:05.000+01:00
diff --git a/decidim-accountability/spec/shared/manage_results_examples.rb b/decidim-accountability/spec/shared/manage_results_examples.rb
@@ -27,7 +27,7 @@
           ca: "El meu nou títol"
         )
 
-        proposal_pick(select_data_picker(:result_proposals, multiple: true), proposals.last)
+        proposals_pick(select_data_picker(:result_proposals, multiple: true), proposals.last(2))
 
         find("*[type=submit]").click
       end
@@ -58,7 +58,7 @@
           ca: "Descripció més llarga"
         )
 
-        proposal_pick(select_data_picker(:result_proposals, multiple: true), proposals.first)
+        proposals_pick(select_data_picker(:result_proposals, multiple: true), proposals.first(2))
         scope_pick(select_data_picker(:result_decidim_scope_id), scope)
         select translated(category.name), from: :result_decidim_category_id
 
diff --git a/decidim-accountability/spec/system/admin_manages_accountability_spec.rb b/decidim-accountability/spec/system/admin_manages_accountability_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "spec_helper"
+require "decidim/proposals/test/capybara_proposals_picker"
 
 describe "Admin manages accountability", type: :system do
   let(:manifest_name) { "accountability" }
diff --git a/decidim-dev/lib/decidim/dev/test/rspec_support/capybara_data_picker.rb b/decidim-dev/lib/decidim/dev/test/rspec_support/capybara_data_picker.rb
@@ -6,8 +6,6 @@ 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}")
@@ -22,5 +20,17 @@ def data_picker_pick_current
       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
+
+    def data_picker_choose_value(value)
+      body = find(:xpath, "//body")
+      expect(body).to have_selector("#data_picker-modal input[data-picker-choose][type=checkbox][value=\"#{value}\"]")
+      body.find("#data_picker-modal input[data-picker-choose][type=checkbox][value=\"#{value}\"]").click
+    end
+
+    def data_picker_close
+      body = find(:xpath, "//body")
+      expect(body).to have_selector("#data_picker-modal .picker-footer a[data-close]")
+      body.find("#data_picker-modal .picker-footer a[data-close]").click
+    end
   end
 end
diff --git a/decidim-dev/lib/decidim/dev/test/rspec_support/capybara_proposals_picker.rb b/decidim-dev/lib/decidim/dev/test/rspec_support/capybara_proposals_picker.rb
diff --git a/decidim-meetings/spec/shared/manage_meetings_examples.rb b/decidim-meetings/spec/shared/manage_meetings_examples.rb
@@ -403,7 +403,7 @@
         fill_in :close_meeting_attendees_count, with: 12
         fill_in :close_meeting_contributions_count, with: 44
         fill_in :close_meeting_attending_organizations, with: "Neighbours Association, Group of People Complaining About Something and Other People"
-        select decidim_html_escape(proposals.first.title), from: :close_meeting_proposal_ids
+        proposals_pick(select_data_picker(:close_meeting_proposal_ids, multiple: true), proposals.first(2))
         click_button "Close"
       end
 
diff --git a/decidim-meetings/spec/system/admin_manages_meetings_spec.rb b/decidim-meetings/spec/system/admin_manages_meetings_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "spec_helper"
+require "decidim/proposals/test/capybara_proposals_picker"
 
 describe "Admin manages meetings", type: :system, serves_map: true do
   let(:manifest_name) { "meetings" }
diff --git a/decidim-proposals/lib/decidim/proposals/test/capybara_proposals_picker.rb b/decidim-proposals/lib/decidim/proposals/test/capybara_proposals_picker.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require "decidim/dev/test/rspec_support/capybara_data_picker"
+
+module Capybara
+  module ProposalsPicker
+    include DataPicker
+
+    RSpec::Matchers.define :have_proposals_picked do |expected|
+      match do |proposals_picker|
+        data_picker = proposals_picker.data_picker
+
+        expected.each do |proposal|
+          expect(data_picker).to have_selector(".picker-values div input[value='#{proposal.id}']", visible: false)
+          expect(data_picker).to have_selector(:xpath, "//div[contains(@class,'picker-values')]/div/a[text()[contains(.,'#{proposal.title}')]]")
+        end
+      end
+    end
+
+    RSpec::Matchers.define :have_proposals_not_picked do |expected|
+      match do |proposals_picker|
+        data_picker = proposals_picker.data_picker
+
+        expected.each do |proposal|
+          expect(data_picker).not_to have_selector(".picker-values div input[value='#{proposal.id}']", visible: false)
+          expect(data_picker).not_to have_selector(:xpath, "//div[contains(@class,'picker-values')]/div/a[text()[contains(.,'#{proposal.title}')]]")
+        end
+      end
+    end
+
+    def proposals_pick(proposals_picker, proposals)
+      data_picker = proposals_picker.data_picker
+
+      expect(data_picker).to have_selector(".picker-prompt")
+      data_picker.find(".picker-prompt").click
+
+      proposals.each do |proposal|
+        data_picker_choose_value(proposal.id)
+      end
+      data_picker_close
+
+      expect(proposals_picker).to have_proposals_picked(proposals)
+    end
+  end
+end
+
+RSpec.configure do |config|
+  config.include Capybara::ProposalsPicker, type: :system
+end

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`ca: "El meu nou títol"`
`28`	`28`	`)`
`29`	`29`
`30`		`- proposal_pick(select_data_picker(:result_proposals, multiple: true), proposals.last)`
	`30`	`+ proposals_pick(select_data_picker(:result_proposals, multiple: true), proposals.last(2))`
`31`	`31`
`32`	`32`	`find("*[type=submit]").click`
`33`	`33`	`end`
`@@ -58,7 +58,7 @@`
`58`	`58`	`ca: "Descripció més llarga"`
`59`	`59`	`)`
`60`	`60`
`61`		`- proposal_pick(select_data_picker(:result_proposals, multiple: true), proposals.first)`
	`61`	`+ proposals_pick(select_data_picker(:result_proposals, multiple: true), proposals.first(2))`
`62`	`62`	`scope_pick(select_data_picker(:result_decidim_scope_id), scope)`
`63`	`63`	`select translated(category.name), from: :result_decidim_category_id`
`64`	`64`