diff --git a/spec/support/common_actions.rb b/spec/support/common_actions.rb index 22910a166..b12fe944c 100644 --- a/spec/support/common_actions.rb +++ b/spec/support/common_actions.rb @@ -4,6 +4,7 @@ Dir["./spec/support/common_actions/custom/*.rb"].each { |f| require f } module CommonActions include Budgets include Comments + include Cookies include Debates include Documents include Emails diff --git a/spec/support/common_actions/cookies.rb b/spec/support/common_actions/cookies.rb new file mode 100644 index 000000000..97b772308 --- /dev/null +++ b/spec/support/common_actions/cookies.rb @@ -0,0 +1,9 @@ +module Cookies + def all_cookies + page.driver.browser.manage.all_cookies + end + + def cookie_by_name(name) + all_cookies.find { |cookie| cookie[:name] == name } + end +end diff --git a/spec/system/admin/budget_investments_spec.rb b/spec/system/admin/budget_investments_spec.rb index 908dbe9b4..1032ed76c 100644 --- a/spec/system/admin/budget_investments_spec.rb +++ b/spec/system/admin/budget_investments_spec.rb @@ -1761,9 +1761,7 @@ describe "Admin budget investments", :admin do scenario "Set cookie with default columns value if undefined" do visit admin_budget_budget_investments_path(budget) - cookies = page.driver.browser.manage.all_cookies - columns_cookie = cookies.find { |cookie| cookie[:name] == "investments-columns" } - cookie_value = columns_cookie[:value] + cookie_value = cookie_by_name("investments-columns")[:value] expect(cookie_value).to eq("id,title,supports,admin,valuator,geozone,feasibility,price," \ "valuation_finished,visible_to_valuators,selected,incompatible") @@ -1811,18 +1809,14 @@ describe "Admin budget investments", :admin do check "Author" end - cookies = page.driver.browser.manage.all_cookies - columns_cookie = cookies.find { |cookie| cookie[:name] == "investments-columns" } - cookie_value = columns_cookie[:value] + cookie_value = cookie_by_name("investments-columns")[:value] expect(cookie_value).to eq("id,supports,admin,geozone,feasibility,valuation_finished," \ "visible_to_valuators,selected,incompatible,author") visit admin_budget_budget_investments_path(budget) - cookies = page.driver.browser.manage.all_cookies - columns_cookie = cookies.find { |cookie| cookie[:name] == "investments-columns" } - cookie_value = columns_cookie[:value] + cookie_value = cookie_by_name("investments-columns")[:value] expect(cookie_value).to eq("id,supports,admin,geozone,feasibility,valuation_finished," \ "visible_to_valuators,selected,incompatible,author")