|
<% if investment.winner? %>
diff --git a/app/views/budgets/results/show.html.erb b/app/views/budgets/results/show.html.erb
index 2343e652c..eb31124ec 100644
--- a/app/views/budgets/results/show.html.erb
+++ b/app/views/budgets/results/show.html.erb
@@ -26,7 +26,8 @@
<% @budget.headings.each do |heading| %>
-
+ <% active_class = heading.id.to_s == params[:heading_id] ? 'bold' : '' %>
+
<%= link_to heading.name,
budget_results_path(@budget, heading_id: heading.id) %>
@@ -34,7 +35,7 @@
- <%= link_to t("budgets.results.hide_discarded_link"), "#", class: "js-toggle-link button hollow margin-bottom", data: {'toggle-selector' => '.js-discarded', 'toggle-text' => t("budgets.results.show_all_link")} %>
+ <%= link_to t("budgets.results.show_all_link"), "#", class: "js-toggle-link button hollow margin-bottom", data: {'toggle-selector' => '.js-discarded', 'toggle-text' => t("budgets.results.hide_discarded_link")} %>
<%= render 'results_table', results_type: :compatible,
@@ -42,8 +43,10 @@
heading_price: @heading.price,
investments: @investments.compatible %>
- <%= render 'results_table', results_type: :incompatible,
- title: t("budgets.results.incompatibles"),
- heading_price: @heading.price,
- investments: @investments.incompatible %>
+ <% if @investments.incompatible.present? %>
+ <%= render 'results_table', results_type: :incompatible,
+ title: t("budgets.results.incompatibles"),
+ heading_price: @heading.price,
+ investments: @investments.incompatible %>
+ <% end %>
diff --git a/config/initializers/tolk.rb b/config/initializers/tolk.rb
deleted file mode 100644
index 2284aa921..000000000
--- a/config/initializers/tolk.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-# encoding: utf-8
-
-# Tolk config file. Generated on January 14, 2016 12:09
-# See github.com/tolk/tolk for more informations
-
-Tolk.config do |config|
-
- # If you need to add a mapping do it like this :
- # May we suggest you use http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes
- # config.mapping['en-AU'] = 'English (Australia)'
- # config.mapping['es-MX'] = 'Spanish (Mexico)'
- # config.mapping['fr-ES'] = 'Frañol !'
- # config.mapping['is'] = 'Icelandic'
- # config.mapping['vi'] = 'Vietnamese'
-
- # Master source of strings to be translated
- config.primary_locale_name = 'en'
-end
-
-Tolk::ApplicationController.authenticator = proc {
- authenticate_or_request_with_http_basic do |username, password|
- username == Rails.application.secrets.translate_username &&
- password == Rails.application.secrets.translate_password
- end
-}
diff --git a/config/locales/en/mailers.yml b/config/locales/en/mailers.yml
index 65da97b55..3b6706929 100644
--- a/config/locales/en/mailers.yml
+++ b/config/locales/en/mailers.yml
@@ -72,7 +72,7 @@ en:
follow_link: "Participatory Budgets"
sincerely: "Sincerely,"
signatory: "DEPARTMENT OF PUBLIC PARTICIPATION"
- share: "Comparte tu proyecto"
+ share: "Share your project"
budget_investment_unfeasible:
hi: "Dear user,"
new_html: "For all these, we invite you to elaborate a new investment that ajusts to the conditions of this process. You can do it following this link: %{url}."
@@ -100,4 +100,4 @@ en:
participate_url: "participate in the final voting"
thanks: "Thank you again for participating."
sincerely: "Sincererly"
- signatory: "DEPARTMENT OF PUBLIC PARTICIPATION"
\ No newline at end of file
+ signatory: "DEPARTMENT OF PUBLIC PARTICIPATION"
diff --git a/config/locales/en/pages.yml b/config/locales/en/pages.yml
index 0b23d63b1..e1c6bcc29 100644
--- a/config/locales/en/pages.yml
+++ b/config/locales/en/pages.yml
@@ -39,7 +39,7 @@ en:
feature_3_html: "Then there is a support phase to prioritize the most interesting, the most supported are evaluated by the City to see if they are viable and how much they are worth."
feature_4_html: "At the end there is a vote phase and you decide which of the approved projects to spend the budget on."
image_alt: "Different phases of a participatory budget"
- figcaption_html: '"Support phase" and "Voting" phase of participatory budgets.'
+ figcaption_html: '"Support" and "Voting" phases of participatory budgets.'
polls:
title: "Polls"
description: "Citizen proposals that reach 1% of support will be put to a vote."
@@ -81,4 +81,4 @@ en:
info_code: 'Now introduce the code you received in letter:'
password: Password
submit: Verify my account
- title: Verify your account
\ No newline at end of file
+ title: Verify your account
diff --git a/config/locales/en/valuation.yml b/config/locales/en/valuation.yml
index ecfbc113f..e07cbc520 100644
--- a/config/locales/en/valuation.yml
+++ b/config/locales/en/valuation.yml
@@ -87,7 +87,7 @@ en:
back: Back
heading: Investment project
info: Author info
- association_name: Asociación
+ association_name: Association
by: Sent by
sent: Sent at
geozone: Scope
diff --git a/config/routes.rb b/config/routes.rb
index ab54fd739..aaa9b5db7 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -418,7 +418,6 @@ Rails.application.routes.draw do
end
mount GraphiQL::Rails::Engine, at: '/graphiql', graphql_path: '/graphql'
- mount Tolk::Engine => '/translate', :as => 'tolk'
# more info pages
get 'more-information', to: 'pages#show', id: 'more_info/index', as: 'more_info'
diff --git a/config/secrets.yml.example b/config/secrets.yml.example
index 6e67e57c8..f67ea65c0 100644
--- a/config/secrets.yml.example
+++ b/config/secrets.yml.example
@@ -33,9 +33,6 @@ production: &production
google_oauth2_key: ""
google_oauth2_secret: ""
- translate_username: ""
- translate_password: ""
-
rollbar_server_token: ""
server_name: ""
diff --git a/db/dev_seeds.rb b/db/dev_seeds.rb
index c0655bfe7..9a55b8c00 100644
--- a/db/dev_seeds.rb
+++ b/db/dev_seeds.rb
@@ -384,12 +384,12 @@ Budget::PHASES.each_with_index do |phase, i|
)
)
- (1..([1, 2, 3].sample)).each do
- group = budget.groups.create!(name: Faker::StarWars.planet)
+ (1..([1, 2, 3].sample)).each do |i|
+ group = budget.groups.create!(name: "#{Faker::StarWars.planet} #{i}")
geozones = Geozone.reorder("RANDOM()").limit([2, 5, 6, 7].sample)
geozones.each do |geozone|
- group.headings << group.headings.create!(name: geozone.name,
+ group.headings << group.headings.create!(name: "#{geozone.name} #{i}",
price: rand(1..100) * 100000,
population: rand(1..50) * 10000)
end
diff --git a/db/migrate/20170708225159_remove_tolk.rb b/db/migrate/20170708225159_remove_tolk.rb
new file mode 100644
index 000000000..d07c88ebb
--- /dev/null
+++ b/db/migrate/20170708225159_remove_tolk.rb
@@ -0,0 +1,10 @@
+class RemoveTolk < ActiveRecord::Migration
+ def change
+ remove_index :tolk_translations, column: [:phrase_id, :locale_id]
+ remove_index :tolk_locales, column: :name
+
+ drop_table :tolk_translations
+ drop_table :tolk_phrases
+ drop_table :tolk_locales
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 2ec4f7e43..f4c717bd8 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20170704105112) do
+ActiveRecord::Schema.define(version: 20170708225159) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -871,32 +871,6 @@ ActiveRecord::Schema.define(version: 20170704105112) do
add_index "tags", ["proposals_count"], name: "index_tags_on_proposals_count", using: :btree
add_index "tags", ["spending_proposals_count"], name: "index_tags_on_spending_proposals_count", using: :btree
- create_table "tolk_locales", force: :cascade do |t|
- t.string "name"
- t.datetime "created_at"
- t.datetime "updated_at"
- end
-
- add_index "tolk_locales", ["name"], name: "index_tolk_locales_on_name", unique: true, using: :btree
-
- create_table "tolk_phrases", force: :cascade do |t|
- t.text "key"
- t.datetime "created_at"
- t.datetime "updated_at"
- end
-
- create_table "tolk_translations", force: :cascade do |t|
- t.integer "phrase_id"
- t.integer "locale_id"
- t.text "text"
- t.text "previous_text"
- t.boolean "primary_updated", default: false
- t.datetime "created_at"
- t.datetime "updated_at"
- end
-
- add_index "tolk_translations", ["phrase_id", "locale_id"], name: "index_tolk_translations_on_phrase_id_and_locale_id", unique: true, using: :btree
-
create_table "users", force: :cascade do |t|
t.string "email", default: ""
t.string "encrypted_password", default: "", null: false
diff --git a/lib/census_api.rb b/lib/census_api.rb
index 1d945d904..066c0be95 100644
--- a/lib/census_api.rb
+++ b/lib/census_api.rb
@@ -92,7 +92,27 @@ class CensusApi
end
def stubbed_valid_response
- {get_habita_datos_response: {get_habita_datos_return: {datos_habitante: { item: {fecha_nacimiento_string: "31-12-1980", identificador_documento: "12345678Z", descripcion_sexo: "Varón", nombre: "José", apellido1: "GarcÃa" }}, datos_vivienda: {item: {codigo_postal: "28013", codigo_distrito: "01"}}}}}
+ {
+ get_habita_datos_response: {
+ get_habita_datos_return: {
+ datos_habitante: {
+ item: {
+ fecha_nacimiento_string: "31-12-1980",
+ identificador_documento: "12345678Z",
+ descripcion_sexo: "Varón",
+ nombre: "José",
+ apellido1: "GarcÃa"
+ }
+ },
+ datos_vivienda: {
+ item: {
+ codigo_postal: "28013",
+ codigo_distrito: "01"
+ }
+ }
+ }
+ }
+ }
end
def stubbed_invalid_response
diff --git a/spec/controllers/legislation/answers_controller_spec.rb b/spec/controllers/legislation/answers_controller_spec.rb
index 569ea2879..629935643 100644
--- a/spec/controllers/legislation/answers_controller_spec.rb
+++ b/spec/controllers/legislation/answers_controller_spec.rb
@@ -13,7 +13,8 @@ describe Legislation::AnswersController do
it 'should create an ahoy event' do
sign_in @user
- post :create, process_id: @process.id, question_id: @question.id, legislation_answer: { legislation_question_option_id: @question_option.id }
+ post :create, process_id: @process.id, question_id: @question.id,
+ legislation_answer: { legislation_question_option_id: @question_option.id }
expect(Ahoy::Event.where(name: :legislation_answer_created).count).to eq 1
expect(Ahoy::Event.last.properties['legislation_answer_id']).to eq Legislation::Answer.last.id
end
@@ -22,7 +23,8 @@ describe Legislation::AnswersController do
sign_in @user
expect do
- xhr :post, :create, process_id: @process.id, question_id: @question.id, legislation_answer: { legislation_question_option_id: @question_option.id }
+ xhr :post, :create, process_id: @process.id, question_id: @question.id,
+ legislation_answer: { legislation_question_option_id: @question_option.id }
end.to change { @question.reload.answers_count }.by(1)
end
@@ -31,7 +33,8 @@ describe Legislation::AnswersController do
@process.update_attribute(:debate_end_date, Date.current - 1.day)
expect do
- xhr :post, :create, process_id: @process.id, question_id: @question.id, legislation_answer: { legislation_question_option_id: @question_option.id }
+ xhr :post, :create, process_id: @process.id, question_id: @question.id,
+ legislation_answer: { legislation_question_option_id: @question_option.id }
end.to_not change { @question.reload.answers_count }
end
end
diff --git a/spec/features/admin/budget_investments_spec.rb b/spec/features/admin/budget_investments_spec.rb
index 57dedcb54..925f105b0 100644
--- a/spec/features/admin/budget_investments_spec.rb
+++ b/spec/features/admin/budget_investments_spec.rb
@@ -312,7 +312,7 @@ feature 'Admin budget investments' do
context "Edit" do
scenario "Change title, incompatible, description or heading" do
- budget_investment = create(:budget_investment, :selected)
+ budget_investment = create(:budget_investment, :incompatible)
create(:budget_heading, group: budget_investment.group, name: "Barbate")
visit admin_budget_budget_investment_path(budget_investment.budget, budget_investment)
@@ -321,7 +321,7 @@ feature 'Admin budget investments' do
fill_in 'budget_investment_title', with: 'Potatoes'
fill_in 'budget_investment_description', with: 'Carrots'
select "#{budget_investment.group.name}: Barbate", from: 'budget_investment[heading_id]'
- check "budget_investment_incompatible"
+ uncheck "budget_investment_incompatible"
check "budget_investment_selected"
click_button 'Update'
@@ -329,10 +329,21 @@ feature 'Admin budget investments' do
expect(page).to have_content 'Potatoes'
expect(page).to have_content 'Carrots'
expect(page).to have_content 'Barbate'
- expect(page).to have_content 'Incompatible'
+ expect(page).to have_content 'Compatibility: Compatible'
expect(page).to have_content 'Selected'
end
+ scenario "Compatible non-winner can't edit incompatibility" do
+ budget_investment = create(:budget_investment, :selected)
+ create(:budget_heading, group: budget_investment.group, name: "Tetuan")
+
+ visit admin_budget_budget_investment_path(budget_investment.budget, budget_investment)
+ click_link 'Edit'
+
+ expect(page).not_to have_content 'Compatibility'
+ expect(page).not_to have_content 'Mark as incompatible'
+ end
+
scenario "Add administrator" do
budget_investment = create(:budget_investment)
administrator = create(:administrator, user: create(:user, username: 'Marta', email: 'marta@admins.org'))
diff --git a/spec/features/admin/poll/questions_spec.rb b/spec/features/admin/poll/questions_spec.rb
index 2a1e100f0..e9b9f277a 100644
--- a/spec/features/admin/poll/questions_spec.rb
+++ b/spec/features/admin/poll/questions_spec.rb
@@ -33,8 +33,10 @@ feature 'Admin poll questions' do
poll = create(:poll, name: 'Movies')
title = "Star Wars: Episode IV - A New Hope"
description = %{
- During the battle, Rebel spies managed to steal secret plans to the Empire's ultimate weapon, the DEATH STAR, an armored space station with enough power to destroy an entire planet.
- Pursued by the Empire's sinister agents, Princess Leia races home aboard her starship, custodian of the stolen plans that can save her people and restore freedom to the galaxy....
+ During the battle, Rebel spies managed to steal secret plans to the Empire's ultimate weapon, the DEATH STAR, an armored space station
+ with enough power to destroy an entire planet.
+ Pursued by the Empire's sinister agents, Princess Leia races home aboard her starship, custodian of the stolen plans that can save her
+ people and restore freedom to the galaxy....
}
visit admin_questions_path
diff --git a/spec/features/budgets/investments_spec.rb b/spec/features/budgets/investments_spec.rb
index e2d85a4f5..96a26ad82 100644
--- a/spec/features/budgets/investments_spec.rb
+++ b/spec/features/budgets/investments_spec.rb
@@ -400,7 +400,8 @@ feature 'Budget Investments' do
scenario "Show milestones", :js do
user = create(:user)
investment = create(:budget_investment)
- milestone = create(:budget_investment_milestone, investment: investment, title: "New text to show")
+ milestone = create(:budget_investment_milestone, investment: investment, title: "New text to show",
+ created_at: DateTime.new(2015, 9, 19).utc)
login_as(user)
visit budget_investment_path(budget_id: investment.budget.id, id: investment.id)
@@ -410,7 +411,7 @@ feature 'Budget Investments' do
within("#tab-milestones") do
expect(page).to have_content(milestone.title)
expect(page).to have_content(milestone.description)
- expect(page).to have_content("Published #{milestone.created_at.strftime("%d/%m/%Y")}")
+ expect(page).to have_content("Published 2015-09-19")
end
end
@@ -602,9 +603,9 @@ feature 'Budget Investments' do
end
scenario 'Order by cost (only when balloting)' do
- create(:budget_investment, :selected, heading: heading, title: 'Build a nice house', price: 1000).update_column(:confidence_score, 10)
- create(:budget_investment, :selected, heading: heading, title: 'Build an ugly house', price: 1000).update_column(:confidence_score, 5)
- create(:budget_investment, :selected, heading: heading, title: 'Build a skyscraper', price: 20000)
+ create(:budget_investment, :selected, heading: heading, title: 'Build a nice house', price: 1000).update_column(:confidence_score, 10)
+ create(:budget_investment, :selected, heading: heading, title: 'Build an ugly house', price: 1000).update_column(:confidence_score, 5)
+ create(:budget_investment, :selected, heading: heading, title: 'Build a skyscraper', price: 20000)
visit budget_investments_path(budget, heading_id: heading.id)
diff --git a/spec/features/budgets/results_spec.rb b/spec/features/budgets/results_spec.rb
index cd9cb0912..3b2d05c65 100644
--- a/spec/features/budgets/results_spec.rb
+++ b/spec/features/budgets/results_spec.rb
@@ -17,6 +17,21 @@ feature 'Results' do
visit budget_path(budget)
click_link "See results"
+ within("#budget-investments-compatible") do
+ expect(page).to have_content investment1.title
+ expect(page).to have_content investment2.title
+ expect(page).not_to have_content investment3.title
+ expect(page).not_to have_content investment4.title
+
+ expect(investment1.title).to appear_before(investment2.title)
+ end
+ end
+
+ scenario "Show non winner & incomaptible investments", :js do
+ visit budget_path(budget)
+ click_link "See results"
+ click_link "Show all"
+
within("#budget-investments-compatible") do
expect(page).to have_content investment1.title
expect(page).to have_content investment2.title
@@ -31,21 +46,6 @@ feature 'Results' do
end
end
- scenario "Displays non winner investments", :js do
- visit budget_path(budget)
- click_link "See results"
- click_link "Hide discarded"
-
- within("#budget-investments-compatible") do
- expect(page).to have_content investment1.title
- expect(page).to have_content investment2.title
- expect(page).not_to have_content investment3.title
- expect(page).not_to have_content investment4.title
-
- expect(investment1.title).to appear_before(investment2.title)
- end
- end
-
scenario "If budget is in a phase different from finished results can't be accessed" do
budget.update phase: (Budget::PHASES - ["finished"]).sample
visit budget_path(budget)
@@ -55,4 +55,14 @@ feature 'Results' do
expect(page).to have_content "You do not have permission to carry out the action"
end
+ scenario "No incompatible investments", :js do
+ investment3.incompatible = false
+ investment3.save
+
+ visit budget_path(budget)
+ click_link "See results"
+
+ expect(page).not_to have_content "Incompatibles"
+ end
+
end
diff --git a/spec/features/comments/budget_investments_spec.rb b/spec/features/comments/budget_investments_spec.rb
index 7e96b1f80..587a1c517 100644
--- a/spec/features/comments/budget_investments_spec.rb
+++ b/spec/features/comments/budget_investments_spec.rb
@@ -62,9 +62,12 @@ feature 'Commenting Budget::Investments' do
end
scenario 'Comment order' do
- c1 = create(:comment, :with_confidence_score, commentable: investment, cached_votes_up: 100, cached_votes_total: 120, created_at: Time.current - 2)
- c2 = create(:comment, :with_confidence_score, commentable: investment, cached_votes_up: 10, cached_votes_total: 12, created_at: Time.current - 1)
- c3 = create(:comment, :with_confidence_score, commentable: investment, cached_votes_up: 1, cached_votes_total: 2, created_at: Time.current)
+ c1 = create(:comment, :with_confidence_score, commentable: investment, cached_votes_up: 100,
+ cached_votes_total: 120, created_at: Time.current - 2)
+ c2 = create(:comment, :with_confidence_score, commentable: investment, cached_votes_up: 10,
+ cached_votes_total: 12, created_at: Time.current - 1)
+ c3 = create(:comment, :with_confidence_score, commentable: investment, cached_votes_up: 1,
+ cached_votes_total: 2, created_at: Time.current)
visit budget_investment_path(investment.budget, investment, order: :most_voted)
@@ -118,7 +121,8 @@ feature 'Commenting Budget::Investments' do
end
scenario 'Sanitizes comment body for security' do
- create :comment, commentable: investment, body: " click me http://www.url.com"
+ create :comment, commentable: investment,
+ body: " click me http://www.url.com"
visit budget_investment_path(investment.budget, investment)
diff --git a/spec/features/comments/debates_spec.rb b/spec/features/comments/debates_spec.rb
index 2a4d46ec3..76320a848 100644
--- a/spec/features/comments/debates_spec.rb
+++ b/spec/features/comments/debates_spec.rb
@@ -62,9 +62,12 @@ feature 'Commenting debates' do
end
scenario 'Comment order' do
- c1 = create(:comment, :with_confidence_score, commentable: debate, cached_votes_up: 100, cached_votes_total: 120, created_at: Time.current - 2)
- c2 = create(:comment, :with_confidence_score, commentable: debate, cached_votes_up: 10, cached_votes_total: 12, created_at: Time.current - 1)
- c3 = create(:comment, :with_confidence_score, commentable: debate, cached_votes_up: 1, cached_votes_total: 2, created_at: Time.current)
+ c1 = create(:comment, :with_confidence_score, commentable: debate, cached_votes_up: 100,
+ cached_votes_total: 120, created_at: Time.current - 2)
+ c2 = create(:comment, :with_confidence_score, commentable: debate, cached_votes_up: 10,
+ cached_votes_total: 12, created_at: Time.current - 1)
+ c3 = create(:comment, :with_confidence_score, commentable: debate, cached_votes_up: 1,
+ cached_votes_total: 2, created_at: Time.current)
visit debate_path(debate, order: :most_voted)
@@ -118,7 +121,8 @@ feature 'Commenting debates' do
end
scenario 'Sanitizes comment body for security' do
- create :comment, commentable: debate, body: " click me http://www.url.com"
+ create :comment, commentable: debate,
+ body: " click me http://www.url.com"
visit debate_path(debate)
diff --git a/spec/features/comments/legislation_annotations_spec.rb b/spec/features/comments/legislation_annotations_spec.rb
index 7727d8204..87896df03 100644
--- a/spec/features/comments/legislation_annotations_spec.rb
+++ b/spec/features/comments/legislation_annotations_spec.rb
@@ -8,7 +8,9 @@ feature 'Commenting legislation questions' do
scenario 'Index' do
3.times { create(:comment, commentable: legislation_annotation) }
- visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process, legislation_annotation.draft_version, legislation_annotation)
+ visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process,
+ legislation_annotation.draft_version,
+ legislation_annotation)
expect(page).to have_css('.comment', count: 4)
@@ -24,6 +26,9 @@ feature 'Commenting legislation questions' do
parent_comment = create(:comment, commentable: legislation_annotation)
first_child = create(:comment, commentable: legislation_annotation, parent: parent_comment)
second_child = create(:comment, commentable: legislation_annotation, parent: parent_comment)
+ href = legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process,
+ legislation_annotation.draft_version,
+ legislation_annotation)
visit comment_path(parent_comment)
@@ -32,7 +37,7 @@ feature 'Commenting legislation questions' do
expect(page).to have_content first_child.body
expect(page).to have_content second_child.body
- expect(page).to have_link "Go back to #{legislation_annotation.title}", href: legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process, legislation_annotation.draft_version, legislation_annotation)
+ expect(page).to have_link "Go back to #{legislation_annotation.title}", href: href
end
scenario 'Collapsable comments', :js do
@@ -40,7 +45,9 @@ feature 'Commenting legislation questions' do
child_comment = create(:comment, body: "First subcomment", commentable: legislation_annotation, parent: parent_comment)
grandchild_comment = create(:comment, body: "Last subcomment", commentable: legislation_annotation, parent: child_comment)
- visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process, legislation_annotation.draft_version, legislation_annotation)
+ visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process,
+ legislation_annotation.draft_version,
+ legislation_annotation)
expect(page).to have_css('.comment', count: 3)
@@ -62,21 +69,33 @@ feature 'Commenting legislation questions' do
end
scenario 'Comment order' do
- c1 = create(:comment, :with_confidence_score, commentable: legislation_annotation, cached_votes_up: 100, cached_votes_total: 120, created_at: Time.current - 2)
- c2 = create(:comment, :with_confidence_score, commentable: legislation_annotation, cached_votes_up: 10, cached_votes_total: 12, created_at: Time.current - 1)
- c3 = create(:comment, :with_confidence_score, commentable: legislation_annotation, cached_votes_up: 1, cached_votes_total: 2, created_at: Time.current)
+ c1 = create(:comment, :with_confidence_score, commentable: legislation_annotation, cached_votes_up: 100,
+ cached_votes_total: 120, created_at: Time.current - 2)
+ c2 = create(:comment, :with_confidence_score, commentable: legislation_annotation, cached_votes_up: 10,
+ cached_votes_total: 12, created_at: Time.current - 1)
+ c3 = create(:comment, :with_confidence_score, commentable: legislation_annotation, cached_votes_up: 1,
+ cached_votes_total: 2, created_at: Time.current)
- visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process, legislation_annotation.draft_version, legislation_annotation, order: :most_voted)
+ visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process,
+ legislation_annotation.draft_version,
+ legislation_annotation,
+ order: :most_voted)
expect(c1.body).to appear_before(c2.body)
expect(c2.body).to appear_before(c3.body)
- visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process, legislation_annotation.draft_version, legislation_annotation, order: :newest)
+ visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process,
+ legislation_annotation.draft_version,
+ legislation_annotation,
+ order: :newest)
expect(c3.body).to appear_before(c2.body)
expect(c2.body).to appear_before(c1.body)
- visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process, legislation_annotation.draft_version, legislation_annotation, order: :oldest)
+ visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process,
+ legislation_annotation.draft_version,
+ legislation_annotation,
+ order: :oldest)
expect(c1.body).to appear_before(c2.body)
expect(c2.body).to appear_before(c3.body)
@@ -88,17 +107,26 @@ feature 'Commenting legislation questions' do
old_child = create(:comment, commentable: legislation_annotation, parent_id: new_root.id, created_at: Time.current - 10)
new_child = create(:comment, commentable: legislation_annotation, parent_id: new_root.id, created_at: Time.current)
- visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process, legislation_annotation.draft_version, legislation_annotation, order: :most_voted)
+ visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process,
+ legislation_annotation.draft_version,
+ legislation_annotation,
+ order: :most_voted)
expect(new_root.body).to appear_before(old_root.body)
expect(old_child.body).to appear_before(new_child.body)
- visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process, legislation_annotation.draft_version, legislation_annotation, order: :newest)
+ visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process,
+ legislation_annotation.draft_version,
+ legislation_annotation,
+ order: :newest)
expect(new_root.body).to appear_before(old_root.body)
expect(new_child.body).to appear_before(old_child.body)
- visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process, legislation_annotation.draft_version, legislation_annotation, order: :oldest)
+ visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process,
+ legislation_annotation.draft_version,
+ legislation_annotation,
+ order: :oldest)
expect(old_root.body).to appear_before(new_root.body)
expect(old_child.body).to appear_before(new_child.body)
@@ -107,7 +135,9 @@ feature 'Commenting legislation questions' do
scenario 'Turns links into html links' do
create :comment, commentable: legislation_annotation, body: 'Built with http://rubyonrails.org/'
- visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process, legislation_annotation.draft_version, legislation_annotation)
+ visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process,
+ legislation_annotation.draft_version,
+ legislation_annotation)
within all('.comment').last do
expect(page).to have_content 'Built with http://rubyonrails.org/'
@@ -118,9 +148,12 @@ feature 'Commenting legislation questions' do
end
scenario 'Sanitizes comment body for security' do
- create :comment, commentable: legislation_annotation, body: " click me http://www.url.com"
+ create :comment, commentable: legislation_annotation,
+ body: " click me http://www.url.com"
- visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process, legislation_annotation.draft_version, legislation_annotation)
+ visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process,
+ legislation_annotation.draft_version,
+ legislation_annotation)
within all('.comment').last do
expect(page).to have_content "click me http://www.url.com"
@@ -133,7 +166,9 @@ feature 'Commenting legislation questions' do
per_page = 10
(per_page + 2).times { create(:comment, commentable: legislation_annotation)}
- visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process, legislation_annotation.draft_version, legislation_annotation)
+ visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process,
+ legislation_annotation.draft_version,
+ legislation_annotation)
expect(page).to have_css('.comment', count: per_page)
within("ul.pagination") do
@@ -149,7 +184,9 @@ feature 'Commenting legislation questions' do
feature 'Not logged user' do
scenario 'can not see comments forms' do
create(:comment, commentable: legislation_annotation)
- visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process, legislation_annotation.draft_version, legislation_annotation)
+ visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process,
+ legislation_annotation.draft_version,
+ legislation_annotation)
expect(page).to have_content 'You must Sign in or Sign up to leave a comment'
within('#comments') do
@@ -161,7 +198,9 @@ feature 'Commenting legislation questions' do
scenario 'Create', :js do
login_as(user)
- visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process, legislation_annotation.draft_version, legislation_annotation)
+ visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process,
+ legislation_annotation.draft_version,
+ legislation_annotation)
fill_in "comment-body-legislation_annotation_#{legislation_annotation.id}", with: 'Have you thought about...?'
click_button 'Publish comment'
@@ -174,7 +213,9 @@ feature 'Commenting legislation questions' do
scenario 'Errors on create', :js do
login_as(user)
- visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process, legislation_annotation.draft_version, legislation_annotation)
+ visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process,
+ legislation_annotation.draft_version,
+ legislation_annotation)
click_button 'Publish comment'
@@ -188,7 +229,9 @@ feature 'Commenting legislation questions' do
comment = legislation_annotation.comments.first
login_as(manuela)
- visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process, legislation_annotation.draft_version, legislation_annotation)
+ visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process,
+ legislation_annotation.draft_version,
+ legislation_annotation)
click_link "Reply"
@@ -208,7 +251,9 @@ feature 'Commenting legislation questions' do
comment = legislation_annotation.comments.first
login_as(user)
- visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process, legislation_annotation.draft_version, legislation_annotation)
+ visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process,
+ legislation_annotation.draft_version,
+ legislation_annotation)
click_link "Reply"
@@ -227,7 +272,10 @@ feature 'Commenting legislation questions' do
parent = parent.children.first
end
- visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process, legislation_annotation.draft_version, legislation_annotation)
+ visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process,
+ legislation_annotation.draft_version,
+ legislation_annotation)
+
expect(page).to have_css(".comment.comment.comment.comment.comment.comment.comment.comment")
end
@@ -235,7 +283,9 @@ feature 'Commenting legislation questions' do
comment = create(:comment, commentable: legislation_annotation)
login_as(user)
- visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process, legislation_annotation.draft_version, legislation_annotation)
+ visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process,
+ legislation_annotation.draft_version,
+ legislation_annotation)
within "#comment_#{comment.id}" do
page.find("#flag-expand-comment-#{comment.id}").click
@@ -252,7 +302,9 @@ feature 'Commenting legislation questions' do
Flag.flag(user, comment)
login_as(user)
- visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process, legislation_annotation.draft_version, legislation_annotation)
+ visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process,
+ legislation_annotation.draft_version,
+ legislation_annotation)
within "#comment_#{comment.id}" do
page.find("#unflag-expand-comment-#{comment.id}").click
@@ -269,7 +321,9 @@ feature 'Commenting legislation questions' do
comment = create(:comment, commentable: legislation_annotation)
login_as(user)
- visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process, legislation_annotation.draft_version, legislation_annotation)
+ visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process,
+ legislation_annotation.draft_version,
+ legislation_annotation)
within "#comment_#{comment.id}" do
page.find("#flag-expand-comment-#{comment.id}").click
@@ -282,7 +336,10 @@ feature 'Commenting legislation questions' do
comment = create(:comment, commentable: legislation_annotation, body: 'this should be visible')
comment.user.erase
- visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process, legislation_annotation.draft_version, legislation_annotation)
+ visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process,
+ legislation_annotation.draft_version,
+ legislation_annotation)
+
within "#comment_#{comment.id}" do
expect(page).to have_content('User deleted')
expect(page).to have_content('this should be visible')
@@ -292,7 +349,10 @@ feature 'Commenting legislation questions' do
scenario 'Submit button is disabled after clicking', :js do
legislation_annotation = create(:legislation_annotation)
login_as(user)
- visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process, legislation_annotation.draft_version, legislation_annotation)
+
+ visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process,
+ legislation_annotation.draft_version,
+ legislation_annotation)
fill_in "comment-body-legislation_annotation_#{legislation_annotation.id}", with: 'Testing submit button!'
click_button 'Publish comment'
@@ -309,7 +369,9 @@ feature 'Commenting legislation questions' do
moderator = create(:moderator)
login_as(moderator.user)
- visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process, legislation_annotation.draft_version, legislation_annotation)
+ visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process,
+ legislation_annotation.draft_version,
+ legislation_annotation)
fill_in "comment-body-legislation_annotation_#{legislation_annotation.id}", with: "I am moderating!"
check "comment-as-moderator-legislation_annotation_#{legislation_annotation.id}"
@@ -331,7 +393,9 @@ feature 'Commenting legislation questions' do
comment = legislation_annotation.comments.first
login_as(manuela)
- visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process, legislation_annotation.draft_version, legislation_annotation)
+ visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process,
+ legislation_annotation.draft_version,
+ legislation_annotation)
click_link "Reply"
@@ -355,7 +419,9 @@ feature 'Commenting legislation questions' do
moderator = create(:moderator)
login_as(moderator.user)
- visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process, legislation_annotation.draft_version, legislation_annotation)
+ visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process,
+ legislation_annotation.draft_version,
+ legislation_annotation)
expect(page).to_not have_content "Comment as administrator"
end
@@ -366,7 +432,9 @@ feature 'Commenting legislation questions' do
admin = create(:administrator)
login_as(admin.user)
- visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process, legislation_annotation.draft_version, legislation_annotation)
+ visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process,
+ legislation_annotation.draft_version,
+ legislation_annotation)
fill_in "comment-body-legislation_annotation_#{legislation_annotation.id}", with: "I am your Admin!"
check "comment-as-administrator-legislation_annotation_#{legislation_annotation.id}"
@@ -388,7 +456,9 @@ feature 'Commenting legislation questions' do
comment = legislation_annotation.comments.first
login_as(manuela)
- visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process, legislation_annotation.draft_version, legislation_annotation)
+ visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process,
+ legislation_annotation.draft_version,
+ legislation_annotation)
click_link "Reply"
@@ -412,7 +482,9 @@ feature 'Commenting legislation questions' do
admin = create(:administrator)
login_as(admin.user)
- visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process, legislation_annotation.draft_version, legislation_annotation)
+ visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process,
+ legislation_annotation.draft_version,
+ legislation_annotation)
expect(page).to_not have_content "Comment as moderator"
end
@@ -432,7 +504,9 @@ feature 'Commenting legislation questions' do
create(:vote, voter: @manuela, votable: @comment, vote_flag: true)
create(:vote, voter: @pablo, votable: @comment, vote_flag: false)
- visit legislation_process_draft_version_annotation_path(@legislation_annotation.draft_version.process, @legislation_annotation.draft_version, @legislation_annotation)
+ visit legislation_process_draft_version_annotation_path(@legislation_annotation.draft_version.process,
+ @legislation_annotation.draft_version,
+ @legislation_annotation)
within("#comment_#{@comment.id}_votes") do
within(".in_favor") do
@@ -448,7 +522,9 @@ feature 'Commenting legislation questions' do
end
scenario 'Create', :js do
- visit legislation_process_draft_version_annotation_path(@legislation_annotation.draft_version.process, @legislation_annotation.draft_version, @legislation_annotation)
+ visit legislation_process_draft_version_annotation_path(@legislation_annotation.draft_version.process,
+ @legislation_annotation.draft_version,
+ @legislation_annotation)
within("#comment_#{@comment.id}_votes") do
find(".in_favor a").click
@@ -466,7 +542,9 @@ feature 'Commenting legislation questions' do
end
scenario 'Update', :js do
- visit legislation_process_draft_version_annotation_path(@legislation_annotation.draft_version.process, @legislation_annotation.draft_version, @legislation_annotation)
+ visit legislation_process_draft_version_annotation_path(@legislation_annotation.draft_version.process,
+ @legislation_annotation.draft_version,
+ @legislation_annotation)
within("#comment_#{@comment.id}_votes") do
find('.in_favor a').click
@@ -485,7 +563,9 @@ feature 'Commenting legislation questions' do
end
xscenario 'Trying to vote multiple times', :js do
- visit legislation_process_draft_version_annotation_path(@legislation_annotation.draft_version.process, @legislation_annotation.draft_version, @legislation_annotation)
+ visit legislation_process_draft_version_annotation_path(@legislation_annotation.draft_version.process,
+ @legislation_annotation.draft_version,
+ @legislation_annotation)
within("#comment_#{@comment.id}_votes") do
find('.in_favor a').click
@@ -510,8 +590,14 @@ feature 'Commenting legislation questions' do
feature "Merged comment threads", :js do
let!(:draft_version) { create(:legislation_draft_version, :published) }
- let!(:annotation1) { create(:legislation_annotation, draft_version: draft_version, text: "my annotation", ranges: [{"start" => "/p[1]", "startOffset" => 1, "end" => "/p[1]", "endOffset" => 5}]) }
- let!(:annotation2) { create(:legislation_annotation, draft_version: draft_version, text: "my other annotation", ranges: [{"start" => "/p[1]", "startOffset" => 1, "end" => "/p[1]", "endOffset" => 10}]) }
+ let!(:annotation1) do
+ create(:legislation_annotation, draft_version: draft_version, text: "my annotation",
+ ranges: [{"start" => "/p[1]", "startOffset" => 1, "end" => "/p[1]", "endOffset" => 5}])
+ end
+ let!(:annotation2) do
+ create(:legislation_annotation, draft_version: draft_version, text: "my other annotation",
+ ranges: [{"start" => "/p[1]", "startOffset" => 1, "end" => "/p[1]", "endOffset" => 10}])
+ end
background do
login_as user
diff --git a/spec/features/comments/legislation_questions_spec.rb b/spec/features/comments/legislation_questions_spec.rb
index 064a72ae0..50eb60172 100644
--- a/spec/features/comments/legislation_questions_spec.rb
+++ b/spec/features/comments/legislation_questions_spec.rb
@@ -25,6 +25,7 @@ feature 'Commenting legislation questions' do
parent_comment = create(:comment, commentable: legislation_question)
first_child = create(:comment, commentable: legislation_question, parent: parent_comment)
second_child = create(:comment, commentable: legislation_question, parent: parent_comment)
+ href = legislation_process_question_path(legislation_question.process, legislation_question)
visit comment_path(parent_comment)
@@ -33,7 +34,7 @@ feature 'Commenting legislation questions' do
expect(page).to have_content first_child.body
expect(page).to have_content second_child.body
- expect(page).to have_link "Go back to #{legislation_question.title}", href: legislation_process_question_path(legislation_question.process, legislation_question)
+ expect(page).to have_link "Go back to #{legislation_question.title}", href: href
end
scenario 'Collapsable comments', :js do
@@ -63,9 +64,12 @@ feature 'Commenting legislation questions' do
end
scenario 'Comment order' do
- c1 = create(:comment, :with_confidence_score, commentable: legislation_question, cached_votes_up: 100, cached_votes_total: 120, created_at: Time.current - 2)
- c2 = create(:comment, :with_confidence_score, commentable: legislation_question, cached_votes_up: 10, cached_votes_total: 12, created_at: Time.current - 1)
- c3 = create(:comment, :with_confidence_score, commentable: legislation_question, cached_votes_up: 1, cached_votes_total: 2, created_at: Time.current)
+ c1 = create(:comment, :with_confidence_score, commentable: legislation_question, cached_votes_up: 100,
+ cached_votes_total: 120, created_at: Time.current - 2)
+ c2 = create(:comment, :with_confidence_score, commentable: legislation_question, cached_votes_up: 10,
+ cached_votes_total: 12, created_at: Time.current - 1)
+ c3 = create(:comment, :with_confidence_score, commentable: legislation_question, cached_votes_up: 1,
+ cached_votes_total: 2, created_at: Time.current)
visit legislation_process_question_path(legislation_question.process, legislation_question, order: :most_voted)
@@ -119,7 +123,8 @@ feature 'Commenting legislation questions' do
end
scenario 'Sanitizes comment body for security' do
- create :comment, commentable: legislation_question, body: " click me http://www.url.com"
+ create :comment, commentable: legislation_question,
+ body: " click me http://www.url.com"
visit legislation_process_question_path(legislation_question.process, legislation_question)
diff --git a/spec/features/comments/proposals_spec.rb b/spec/features/comments/proposals_spec.rb
index d10a11de7..173dad2e6 100644
--- a/spec/features/comments/proposals_spec.rb
+++ b/spec/features/comments/proposals_spec.rb
@@ -62,9 +62,12 @@ feature 'Commenting proposals' do
end
scenario 'Comment order' do
- c1 = create(:comment, :with_confidence_score, commentable: proposal, cached_votes_up: 100, cached_votes_total: 120, created_at: Time.current - 2)
- c2 = create(:comment, :with_confidence_score, commentable: proposal, cached_votes_up: 10, cached_votes_total: 12, created_at: Time.current - 1)
- c3 = create(:comment, :with_confidence_score, commentable: proposal, cached_votes_up: 1, cached_votes_total: 2, created_at: Time.current)
+ c1 = create(:comment, :with_confidence_score, commentable: proposal, cached_votes_up: 100,
+ cached_votes_total: 120, created_at: Time.current - 2)
+ c2 = create(:comment, :with_confidence_score, commentable: proposal, cached_votes_up: 10,
+ cached_votes_total: 12, created_at: Time.current - 1)
+ c3 = create(:comment, :with_confidence_score, commentable: proposal, cached_votes_up: 1,
+ cached_votes_total: 2, created_at: Time.current)
visit proposal_path(proposal, order: :most_voted)
@@ -118,7 +121,8 @@ feature 'Commenting proposals' do
end
scenario 'Sanitizes comment body for security' do
- create :comment, commentable: proposal, body: " click me http://www.url.com"
+ create :comment, commentable: proposal,
+ body: " click me http://www.url.com"
visit proposal_path(proposal)
diff --git a/spec/features/debates_spec.rb b/spec/features/debates_spec.rb
index b1357bb1c..749c7a373 100644
--- a/spec/features/debates_spec.rb
+++ b/spec/features/debates_spec.rb
@@ -189,11 +189,12 @@ feature 'Debates' do
scenario 'JS injection is prevented but autolinking is respected' do
author = create(:user)
+ js_injection_string = " click me http://example.org"
login_as(author)
visit new_debate_path
fill_in 'debate_title', with: 'Testing auto link'
- fill_in 'debate_description', with: " click me http://example.org"
+ fill_in 'debate_description', with: js_injection_string
check 'debate_terms_of_service'
click_button 'Start a debate'
diff --git a/spec/features/legacy_legislation_spec.rb b/spec/features/legacy_legislation_spec.rb
index 5df3b8f76..8ccc7fcb0 100644
--- a/spec/features/legacy_legislation_spec.rb
+++ b/spec/features/legacy_legislation_spec.rb
@@ -77,8 +77,10 @@ feature 'Legacy Legislation' do
scenario 'Search' do
legacy_legislation = create(:legacy_legislation)
- annotation1 = create(:annotation, legacy_legislation: legacy_legislation, text: "my annotation", ranges: [{"start" => "/div[1]", "startOffset" => 5, "end" => "/div[1]", "endOffset" => 10}])
- annotation2 = create(:annotation, legacy_legislation: legacy_legislation, text: "my other annotation", ranges: [{"start" => "/div[1]", "startOffset" => 12, "end" => "/div[1]", "endOffset" => 19}])
+ annotation1 = create(:annotation, legacy_legislation: legacy_legislation, text: "my annotation",
+ ranges: [{"start" => "/div[1]", "startOffset" => 5, "end" => "/div[1]", "endOffset" => 10}])
+ annotation2 = create(:annotation, legacy_legislation: legacy_legislation, text: "my other annotation",
+ ranges: [{"start" => "/div[1]", "startOffset" => 12, "end" => "/div[1]", "endOffset" => 19}])
visit legacy_legislation_path(legacy_legislation)
diff --git a/spec/features/legislation/draft_versions_spec.rb b/spec/features/legislation/draft_versions_spec.rb
index f0a798b85..ea2cb854d 100644
--- a/spec/features/legislation/draft_versions_spec.rb
+++ b/spec/features/legislation/draft_versions_spec.rb
@@ -10,9 +10,12 @@ feature 'Legislation Draft Versions' do
context "See draft text page" do
before(:each) do
@process = create(:legislation_process)
- @draft_version_1 = create(:legislation_draft_version, process: @process, title: "Version 1", body: "Body of the first version", status: "published")
- @draft_version_2 = create(:legislation_draft_version, process: @process, title: "Version 2", body: "Body of the second version", status: "published")
- @draft_version_3 = create(:legislation_draft_version, process: @process, title: "Version 3", body: "Body of the third version", status: "draft")
+ @draft_version_1 = create(:legislation_draft_version, process: @process, title: "Version 1",
+ body: "Body of the first version", status: "published")
+ @draft_version_2 = create(:legislation_draft_version, process: @process, title: "Version 2",
+ body: "Body of the second version", status: "published")
+ @draft_version_3 = create(:legislation_draft_version, process: @process, title: "Version 3",
+ body: "Body of the third version", status: "draft")
end
it "shows the text body for this version" do
@@ -64,7 +67,8 @@ feature 'Legislation Draft Versions' do
context "for final versions" do
it "does not show the comments panel" do
- final_version = create(:legislation_draft_version, process: @process, title: "Final version", body: "Final body", status: "published", final_version: true)
+ final_version = create(:legislation_draft_version, process: @process, title: "Final version",
+ body: "Final body", status: "published", final_version: true)
visit legislation_process_draft_version_path(@process, final_version)
@@ -78,9 +82,12 @@ feature 'Legislation Draft Versions' do
context "See changes page" do
before(:each) do
@process = create(:legislation_process)
- @draft_version_1 = create(:legislation_draft_version, process: @process, title: "Version 1", body: "Body of the first version", changelog: "Changes for first version", status: "published")
- @draft_version_2 = create(:legislation_draft_version, process: @process, title: "Version 2", body: "Body of the second version", changelog: "Changes for second version", status: "published")
- @draft_version_3 = create(:legislation_draft_version, process: @process, title: "Version 3", body: "Body of the third version", changelog: "Changes for third version", status: "draft")
+ @draft_version_1 = create(:legislation_draft_version, process: @process, title: "Version 1", body: "Body of the first version",
+ changelog: "Changes for first version", status: "published")
+ @draft_version_2 = create(:legislation_draft_version, process: @process, title: "Version 2", body: "Body of the second version",
+ changelog: "Changes for second version", status: "published")
+ @draft_version_3 = create(:legislation_draft_version, process: @process, title: "Version 3", body: "Body of the third version",
+ changelog: "Changes for third version", status: "draft")
end
it "shows the changes for this version" do
@@ -173,8 +180,10 @@ feature 'Legislation Draft Versions' do
scenario 'View annotations and comments' do
draft_version = create(:legislation_draft_version, :published)
- annotation1 = create(:legislation_annotation, draft_version: draft_version, text: "my annotation", ranges: [{"start" => "/p[1]", "startOffset" => 5, "end" => "/p[1]", "endOffset" => 10}])
- annotation2 = create(:legislation_annotation, draft_version: draft_version, text: "my other annotation", ranges: [{"start" => "/p[1]", "startOffset" => 12, "end" => "/p[1]", "endOffset" => 19}])
+ annotation1 = create(:legislation_annotation, draft_version: draft_version, text: "my annotation",
+ ranges: [{"start" => "/p[1]", "startOffset" => 5, "end" => "/p[1]", "endOffset" => 10}])
+ create(:legislation_annotation, draft_version: draft_version, text: "my other annotation",
+ ranges: [{"start" => "/p[1]", "startOffset" => 12, "end" => "/p[1]", "endOffset" => 19}])
comment = create(:comment, commentable: annotation1)
visit legislation_process_draft_version_path(draft_version.process, draft_version)
@@ -190,7 +199,8 @@ feature 'Legislation Draft Versions' do
scenario "Publish new comment for an annotation from comments box" do
draft_version = create(:legislation_draft_version, :published)
- annotation = create(:legislation_annotation, draft_version: draft_version, text: "my annotation", ranges: [{"start" => "/p[1]", "startOffset" => 6, "end" => "/p[1]", "endOffset" => 11}])
+ annotation = create(:legislation_annotation, draft_version: draft_version, text: "my annotation",
+ ranges: [{"start" => "/p[1]", "startOffset" => 6, "end" => "/p[1]", "endOffset" => 11}])
visit legislation_process_draft_version_path(draft_version.process, draft_version)
@@ -212,8 +222,10 @@ feature 'Legislation Draft Versions' do
scenario 'View annotations and comments in an included range' do
draft_version = create(:legislation_draft_version, :published)
- annotation1 = create(:legislation_annotation, draft_version: draft_version, text: "my annotation", ranges: [{"start" => "/p[1]", "startOffset" => 1, "end" => "/p[1]", "endOffset" => 5}])
- annotation2 = create(:legislation_annotation, draft_version: draft_version, text: "my other annotation", ranges: [{"start" => "/p[1]", "startOffset" => 1, "end" => "/p[1]", "endOffset" => 10}])
+ annotation1 = create(:legislation_annotation, draft_version: draft_version, text: "my annotation",
+ ranges: [{"start" => "/p[1]", "startOffset" => 1, "end" => "/p[1]", "endOffset" => 5}])
+ annotation2 = create(:legislation_annotation, draft_version: draft_version, text: "my other annotation",
+ ranges: [{"start" => "/p[1]", "startOffset" => 1, "end" => "/p[1]", "endOffset" => 10}])
visit legislation_process_draft_version_path(draft_version.process, draft_version)
@@ -232,8 +244,10 @@ feature 'Legislation Draft Versions' do
context "Annotations page" do
background do
@draft_version = create(:legislation_draft_version, :published)
- @annotation_1 = create(:legislation_annotation, draft_version: @draft_version, text: "my annotation", quote: "ipsum", ranges: [{"start" => "/p[1]", "startOffset" => 6, "end" => "/p[1]", "endOffset" => 11}])
- @annotation_2 = create(:legislation_annotation, draft_version: @draft_version, text: "my other annotation", quote: "audiam", ranges: [{"start" => "/p[3]", "startOffset" => 6, "end" => "/p[3]", "endOffset" => 11}])
+ create(:legislation_annotation, draft_version: @draft_version, text: "my annotation", quote: "ipsum",
+ ranges: [{"start" => "/p[1]", "startOffset" => 6, "end" => "/p[1]", "endOffset" => 11}])
+ create(:legislation_annotation, draft_version: @draft_version, text: "my other annotation", quote: "audiam",
+ ranges: [{"start" => "/p[3]", "startOffset" => 6, "end" => "/p[3]", "endOffset" => 11}])
end
scenario "See all annotations for a draft version" do
@@ -246,10 +260,14 @@ feature 'Legislation Draft Versions' do
context "switching versions" do
background do
@process = create(:legislation_process)
- @draft_version_1 = create(:legislation_draft_version, :published, process: @process, title: "Version 1", body: "Text with quote for version 1")
- @annotation_1 = create(:legislation_annotation, draft_version: @draft_version_1, text: "annotation for version 1", quote: "quote for version 1", ranges: [{"start" => "/p[1]", "startOffset" => 11, "end" => "/p[1]", "endOffset" => 30}])
- @draft_version_2 = create(:legislation_draft_version, :published, process: @process, title: "Version 2", body: "Text with quote for version 2")
- @annotation_1 = create(:legislation_annotation, draft_version: @draft_version_2, text: "annotation for version 2", quote: "quote for version 2", ranges: [{"start" => "/p[1]", "startOffset" => 11, "end" => "/p[1]", "endOffset" => 30}])
+ @draft_version_1 = create(:legislation_draft_version, :published, process: @process,
+ title: "Version 1", body: "Text with quote for version 1")
+ create(:legislation_annotation, draft_version: @draft_version_1, text: "annotation for version 1", quote: "quote for version 1",
+ ranges: [{"start" => "/p[1]", "startOffset" => 11, "end" => "/p[1]", "endOffset" => 30}])
+ @draft_version_2 = create(:legislation_draft_version, :published, process: @process,
+ title: "Version 2", body: "Text with quote for version 2")
+ create(:legislation_annotation, draft_version: @draft_version_2, text: "annotation for version 2", quote: "quote for version 2",
+ ranges: [{"start" => "/p[1]", "startOffset" => 11, "end" => "/p[1]", "endOffset" => 30}])
end
scenario "without js" do
@@ -278,12 +296,14 @@ feature 'Legislation Draft Versions' do
context "Annotation comments page" do
background do
@draft_version = create(:legislation_draft_version, :published)
- @annotation_1 = create(:legislation_annotation, draft_version: @draft_version, text: "my annotation", quote: "ipsum", ranges: [{"start" => "/p[1]", "startOffset" => 6, "end" => "/p[1]", "endOffset" => 11}])
- @annotation_2 = create(:legislation_annotation, draft_version: @draft_version, text: "my other annotation", quote: "audiam", ranges: [{"start" => "/p[3]", "startOffset" => 6, "end" => "/p[3]", "endOffset" => 11}])
+ create(:legislation_annotation, draft_version: @draft_version, text: "my annotation", quote: "ipsum",
+ ranges: [{"start" => "/p[1]", "startOffset" => 6, "end" => "/p[1]", "endOffset" => 11}])
+ @annotation = create(:legislation_annotation, draft_version: @draft_version, text: "my other annotation", quote: "audiam",
+ ranges: [{"start" => "/p[3]", "startOffset" => 6, "end" => "/p[3]", "endOffset" => 11}])
end
scenario "See one annotation with replies for a draft version" do
- visit legislation_process_draft_version_annotation_path(@draft_version.process, @draft_version, @annotation_2)
+ visit legislation_process_draft_version_annotation_path(@draft_version.process, @draft_version, @annotation)
expect(page).to_not have_content "ipsum"
expect(page).to_not have_content "my annotation"
diff --git a/spec/features/management/budget_investments_spec.rb b/spec/features/management/budget_investments_spec.rb
index edf0980b1..f0fbbefe3 100644
--- a/spec/features/management/budget_investments_spec.rb
+++ b/spec/features/management/budget_investments_spec.rb
@@ -84,13 +84,16 @@ feature 'Budget Investments' do
expect(page).to have_css('.budget-investment', count: 1)
expect(page).to have_content(budget_investment1.title)
expect(page).to_not have_content(budget_investment2.title)
- expect(page).to have_css("a[href='#{management_budget_investment_path(@budget, budget_investment1)}']", text: budget_investment1.title)
+ expect(page).to have_css("a[href='#{management_budget_investment_path(@budget, budget_investment1)}']",
+ text: budget_investment1.title)
end
end
scenario "by heading" do
- budget_investment1 = create(:budget_investment, budget: @budget, title: "Hey ho", heading: create(:budget_heading, name: "District 9"))
- budget_investment2 = create(:budget_investment, budget: @budget, title: "Let's go", heading: create(:budget_heading, name: "Area 52"))
+ budget_investment1 = create(:budget_investment, budget: @budget, title: "Hey ho",
+ heading: create(:budget_heading, name: "District 9"))
+ budget_investment2 = create(:budget_investment, budget: @budget, title: "Let's go",
+ heading: create(:budget_heading, name: "Area 52"))
user = create(:user, :level_two)
login_managed_user(user)
@@ -108,7 +111,8 @@ feature 'Budget Investments' do
expect(page).to have_css('.budget-investment', count: 1)
expect(page).to_not have_content(budget_investment1.title)
expect(page).to have_content(budget_investment2.title)
- expect(page).to have_css("a[href='#{management_budget_investment_path(@budget, budget_investment2)}']", text: budget_investment2.title)
+ expect(page).to have_css("a[href='#{management_budget_investment_path(@budget, budget_investment2)}']",
+ text: budget_investment2.title)
end
end
end
@@ -135,8 +139,10 @@ feature 'Budget Investments' do
within("#budget-investments") do
expect(page).to have_css('.budget-investment', count: 2)
- expect(page).to have_css("a[href='#{management_budget_investment_path(@budget, budget_investment1)}']", text: budget_investment1.title)
- expect(page).to have_css("a[href='#{management_budget_investment_path(@budget, budget_investment2)}']", text: budget_investment2.title)
+ expect(page).to have_css("a[href='#{management_budget_investment_path(@budget, budget_investment1)}']",
+ text: budget_investment1.title)
+ expect(page).to have_css("a[href='#{management_budget_investment_path(@budget, budget_investment2)}']",
+ text: budget_investment2.title)
end
end
diff --git a/spec/features/proposal_notifications_spec.rb b/spec/features/proposal_notifications_spec.rb
index be6411aed..4756a1903 100644
--- a/spec/features/proposal_notifications_spec.rb
+++ b/spec/features/proposal_notifications_spec.rb
@@ -92,7 +92,8 @@ feature 'Proposal Notifications' do
scenario "Show notifications" do
proposal = create(:proposal)
notification1 = create(:proposal_notification, proposal: proposal, title: "Hey guys", body: "Just wanted to let you know that...")
- notification2 = create(:proposal_notification, proposal: proposal, title: "Another update", body: "We are almost there please share with your peoples!")
+ notification2 = create(:proposal_notification, proposal: proposal, title: "Another update",
+ body: "We are almost there please share with your peoples!")
visit proposal_path(proposal)
diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb
index 395d32133..1cb39a579 100644
--- a/spec/features/proposals_spec.rb
+++ b/spec/features/proposals_spec.rb
@@ -333,13 +333,14 @@ feature 'Proposals' do
scenario 'JS injection is prevented but autolinking is respected' do
author = create(:user)
+ js_injection_string = " click me http://example.org"
login_as(author)
visit new_proposal_path
fill_in 'proposal_title', with: 'Testing auto link'
fill_in 'proposal_question', with: 'Should I stay or should I go?'
fill_in 'proposal_summary', with: 'In summary, what we want is...'
- fill_in 'proposal_description', with: " click me http://example.org"
+ fill_in 'proposal_description', with: js_injection_string
fill_in 'proposal_responsible_name', with: 'Isabel Garcia'
check 'proposal_terms_of_service'
diff --git a/spec/features/users_auth_spec.rb b/spec/features/users_auth_spec.rb
index 566c1c233..c082ba85a 100644
--- a/spec/features/users_auth_spec.rb
+++ b/spec/features/users_auth_spec.rb
@@ -6,6 +6,7 @@ feature 'Users' do
context 'Sign up' do
scenario 'Success' do
+ message = "You have been sent a message containing a verification link. Please click on this link to activate your account."
visit '/'
click_link 'Register'
@@ -17,7 +18,7 @@ feature 'Users' do
click_button 'Register'
- expect(page).to have_content "You have been sent a message containing a verification link. Please click on this link to activate your account."
+ expect(page).to have_content message
confirm_email
diff --git a/spec/features/verification/letter_spec.rb b/spec/features/verification/letter_spec.rb
index 828dde908..6291557f0 100644
--- a/spec/features/verification/letter_spec.rb
+++ b/spec/features/verification/letter_spec.rb
@@ -11,7 +11,8 @@ feature 'Verify Letter' do
click_link "Send me a letter with the code"
- expect(page).to have_content "Thank you for requesting your maximum security code (only required for the final votes). In a few days we will send it to the address featuring in the data we have on file."
+ expect(page).to have_content "Thank you for requesting your maximum security code (only required for the final votes). In a few days"\
+ " we will send it to the address featuring in the data we have on file."
user.reload
diff --git a/spec/features/verification/level_three_verification_spec.rb b/spec/features/verification/level_three_verification_spec.rb
index 419facf3a..ff88f8477 100644
--- a/spec/features/verification/level_three_verification_spec.rb
+++ b/spec/features/verification/level_three_verification_spec.rb
@@ -87,6 +87,7 @@ feature 'Level three verification' do
click_link "Send me a letter with the code"
- expect(page).to have_content "Thank you for requesting your maximum security code (only required for the final votes). In a few days we will send it to the address featuring in the data we have on file."
+ expect(page).to have_content "Thank you for requesting your maximum security code (only required for the final votes)."\
+ " In a few days we will send it to the address featuring in the data we have on file."
end
end
diff --git a/spec/lib/census_api_spec.rb b/spec/lib/census_api_spec.rb
index 274101f22..8e2be6301 100644
--- a/spec/lib/census_api_spec.rb
+++ b/spec/lib/census_api_spec.rb
@@ -23,13 +23,25 @@ describe CensusApi do
end
it 'adds upper and lowercase letter when the letter is present' do
- expect(api.get_document_number_variants(1, '1234567A')).to eq(['1234567', '01234567', '1234567a', '1234567A', '01234567a', '01234567A'])
+ expect(api.get_document_number_variants(1, '1234567A')).to eq(%w(1234567 01234567 1234567a 1234567A 01234567a 01234567A))
end
end
describe '#call' do
let(:invalid_body) { {get_habita_datos_response: {get_habita_datos_return: {datos_habitante: {}}}} }
- let(:valid_body){ {get_habita_datos_response: {get_habita_datos_return: {datos_habitante: {item: {fecha_nacimiento_string: "1-1-1980"}}}}} }
+ let(:valid_body) do
+ {
+ get_habita_datos_response: {
+ get_habita_datos_return: {
+ datos_habitante: {
+ item: {
+ fecha_nacimiento_string: "1-1-1980"
+ }
+ }
+ }
+ }
+ }
+ end
it "returns the response for the first valid variant" do
allow(api).to receive(:get_response_body).with(1, "00123456").and_return(invalid_body)
diff --git a/spec/lib/manager_authenticator_spec.rb b/spec/lib/manager_authenticator_spec.rb
index c53a26f5e..8f27a61d3 100644
--- a/spec/lib/manager_authenticator_spec.rb
+++ b/spec/lib/manager_authenticator_spec.rb
@@ -51,8 +51,9 @@ describe ManagerAuthenticator do
end
it 'should call the verification user method' do
+ message = { ub: {user_key: "31415926", date: "20151031135905"} }
allow(@authenticator).to receive(:application_authorized?).and_return(true)
- expect(@authenticator.send(:client)).to receive(:call).with(:get_status_user_data, message: { ub: {user_key: "31415926", date: "20151031135905"} })
+ expect(@authenticator.send(:client)).to receive(:call).with(:get_status_user_data, message: message)
@authenticator.auth
end
@@ -62,4 +63,4 @@ describe ManagerAuthenticator do
@authenticator.auth
end
end
-end
\ No newline at end of file
+end
diff --git a/spec/models/budget/result_spec.rb b/spec/models/budget/result_spec.rb
index 85eb14f3e..a650e25c5 100644
--- a/spec/models/budget/result_spec.rb
+++ b/spec/models/budget/result_spec.rb
@@ -15,7 +15,7 @@ describe Budget::Result do
investment4 = create(:budget_investment, :selected, heading: heading, price: 500, ballot_lines_count: 600, winner: false)
investment5 = create(:budget_investment, :selected, heading: heading, price: 100, ballot_lines_count: 500, winner: false)
- Budget::Result.new(budget, heading).calculate_winners
+ described_class.new(budget, heading).calculate_winners
expect(heading.investments.winners.pluck(:id)).to match_array([investment1.id, investment2.id, investment4.id])
end
@@ -29,7 +29,7 @@ describe Budget::Result do
investment4 = create(:budget_investment, :winner, heading: heading, price: 500, ballot_lines_count: 600)
investment5 = create(:budget_investment, :winner, heading: heading, price: 100, ballot_lines_count: 500)
- Budget::Result.new(budget, heading).calculate_winners
+ described_class.new(budget, heading).calculate_winners
expect(heading.investments.winners.pluck(:id)).to match_array([investment1.id, investment2.id, investment4.id])
end
@@ -49,6 +49,20 @@ describe Budget::Result do
expect(heading.investments.winners.pluck(:id)).to match_array([investment1.id, investment2.id, investment4.id])
end
end
- end
+ context "When an incompatible is flagged as compatible again" do
+ it "recalculates winners taking it in consideration" do
+ investment1 = create(:budget_investment, :winner, heading: heading, price: 200, ballot_lines_count: 900)
+ investment2 = create(:budget_investment, :winner, heading: heading, price: 300, ballot_lines_count: 800)
+ investment3 = create(:budget_investment, :incompatible, heading: heading, price: 500, ballot_lines_count: 700)
+ investment4 = create(:budget_investment, :winner, heading: heading, price: 500, ballot_lines_count: 600)
+ investment5 = create(:budget_investment, :winner, heading: heading, price: 100, ballot_lines_count: 500)
+
+ investment3.incompatible = false
+ investment3.save
+
+ expect(heading.investments.winners.pluck(:id)).to match_array([investment1.id, investment2.id, investment3.id])
+ end
+ end
+ end
end
diff --git a/spec/models/legislation/annotation_spec.rb b/spec/models/legislation/annotation_spec.rb
index 0daca383a..ffcffd6e3 100644
--- a/spec/models/legislation/annotation_spec.rb
+++ b/spec/models/legislation/annotation_spec.rb
@@ -10,38 +10,102 @@ RSpec.describe Legislation::Annotation, type: :model do
end
it "calculates the context for multinode annotations" do
+ quote = "ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam"\
+ " erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex"\
+ " ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum"\
+ " dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril"\
+ " delenit augue duis dolore te feugait nulla facilisi."\
+ "\n\n"\
+ "Expetenda tincidunt in sed, ex partem placerat sea, porro commodo ex eam. His putant aeterno interesset at. Usu ea mundi"\
+ " tincidunt, omnium virtute aliquando ius ex. Ea aperiri sententiae duo. Usu nullam dolorum quaestio ei, sit vidit facilisis"\
+ " ea. Per ne impedit iracundia neglegentur. Consetetur neglegentur eum ut, vis animal legimus inimicus id."\
+ "\n\n"\
+ "His audiam"
annotation = create(:legislation_annotation,
draft_version: draft_version,
- quote: "ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.
-
-Expetenda tincidunt in sed, ex partem placerat sea, porro commodo ex eam. His putant aeterno interesset at. Usu ea mundi tincidunt, omnium virtute aliquando ius ex. Ea aperiri sententiae duo. Usu nullam dolorum quaestio ei, sit vidit facilisis ea. Per ne impedit iracundia neglegentur. Consetetur neglegentur eum ut, vis animal legimus inimicus id.
-
-His audiam",
+ quote: quote,
ranges: [{"start" => "/p[1]", "startOffset" => 6, "end" => "/p[3]", "endOffset" => 11}]
)
- expect(annotation.context).to eq("Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.\n\nExpetenda tincidunt in sed, ex partem placerat sea, porro commodo ex eam. His putant aeterno interesset at. Usu ea mundi tincidunt, omnium virtute aliquando ius ex. Ea aperiri sententiae duo. Usu nullam dolorum quaestio ei, sit vidit facilisis ea. Per ne impedit iracundia neglegentur. Consetetur neglegentur eum ut, vis animal legimus inimicus id.\n\nHis audiamdeserunt in, eum ubique voluptatibus te. In reque dicta usu. Ne rebum dissentiet eam, vim omnis deseruisse id. Ullum deleniti vituperata at quo, insolens complectitur te eos, ea pri dico munere propriae. Vel ferri facilis ut, qui paulo ridens praesent ad. Possim alterum qui cu. Accusamus consulatu ius te, cu decore soleat appareat usu.")
+ context = "Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt"\
+ " ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper"\
+ " suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit"\
+ " esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui"\
+ " blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.\n\nExpetenda tincidunt in sed, ex"\
+ " partem placerat sea, porro commodo ex eam. His putant aeterno interesset at. Usu ea mundi tincidunt, omnium virtute"\
+ " aliquando ius ex. Ea aperiri sententiae duo. Usu nullam dolorum quaestio ei, sit vidit facilisis ea. Per ne impedit"\
+ " iracundia neglegentur. Consetetur neglegentur eum ut, vis animal legimus inimicus id.\n\nHis audiamdeserunt in, eum"\
+ " ubique voluptatibus te. In reque dicta usu. Ne rebum dissentiet eam, vim omnis deseruisse id. Ullum deleniti vituperata at"\
+ " quo, insolens complectitur te eos, ea pri dico munere propriae. Vel ferri facilis ut, qui paulo ridens praesent ad. Possim"\
+ " alterum qui cu. Accusamus consulatu ius te, cu decore soleat appareat usu."
+ expect(annotation.context).to eq(context)
end
it "calculates the context for multinode annotations 2" do
+ quote = "Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla"\
+ " facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore"\
+ " te feugait nulla facilisi.\r\n\r\nExpetenda tincidunt in sed, ex partem placerat sea, porro commodo ex eam. His putant"\
+ " aeterno interesset at. Usu ea mundi tincidunt, omnium virtute aliquando ius ex. Ea aperiri sententiae duo"
annotation = create(:legislation_annotation,
draft_version: draft_version,
- quote: "Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.\r\n\r\nExpetenda tincidunt in sed, ex partem placerat sea, porro commodo ex eam. His putant aeterno interesset at. Usu ea mundi tincidunt, omnium virtute aliquando ius ex. Ea aperiri sententiae duo",
+ quote: quote,
ranges: [{"start" => "/p[1]", "startOffset" => 273, "end" => "/p[2]", "endOffset" => 190}]
)
- expect(annotation.context).to eq("Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.\r\n\r\nExpetenda tincidunt in sed, ex partem placerat sea, porro commodo ex eam. His putant aeterno interesset at. Usu ea mundi tincidunt, omnium virtute aliquando ius ex. Ea aperiri sententiae duo. Usu nullam dolorum quaestio ei, sit vidit facilisis ea. Per ne impedit iracundia neglegentur. Consetetur neglegentur eum ut, vis animal legimus inimicus id.")
+ context = "Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna"\
+ " aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut"\
+ " aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit"\
+ " esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui"\
+ " blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.\r\n\r\nExpetenda tincidunt in sed, ex"\
+ " partem placerat sea, porro commodo ex eam. His putant aeterno interesset at. Usu ea mundi tincidunt, omnium virtute"\
+ " aliquando ius ex. Ea aperiri sententiae duo. Usu nullam dolorum quaestio ei, sit vidit facilisis ea. Per ne impedit"\
+ " iracundia neglegentur. Consetetur neglegentur eum ut, vis animal legimus inimicus id."
+ expect(annotation.context).to eq(context)
end
it "calculates the context for multinode annotations 3" do
- draft_version = create(:legislation_draft_version, body: "The GNU Affero General Public License is a free, copyleft license for software and other kinds of works, specifically designed to ensure cooperation with the community in the case of network server software.\r\n\r\nThe licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, our General Public Licenses are intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users.\r\n\r\nWhen we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things.\r\n\r\nDevelopers that use our General Public Licenses protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License which gives you legal permission to copy, distribute and/or modify the software.\r\n\r\nA secondary benefit of defending all users' freedom is that improvements made in alternate versions of the program, if they receive widespread use, become available for other developers to incorporate. Many developers of free software are heartened and encouraged by the resulting cooperation. However, in the case of software used on network servers, this result may fail to come about. The GNU General Public License permits making a modified version and letting the public access it on a server without ever releasing its source code to the public.\r\n\r\nThe GNU Affero General Public License is designed specifically to ensure that, in such cases, the modified source code becomes available to the community. It requires the operator of a network server to provide the source code of the modified version running there to the users of that server. Therefore, public use of a modified version, on a publicly accessible server, gives the public access to the source code of the modified version.\r\n\r\nAn older license, called the Affero General Public License and published by Affero, was designed to accomplish similar goals. This is a different license, not a version of the Affero GPL, but Affero has released a new version of the Affero GPL which permits relicensing under this license.")
+ body = "The GNU Affero General Public License is a free, copyleft license for software and other kinds of works, specifically designed"\
+ " to ensure cooperation with the community in the case of network server software.\r\n\r\nThe licenses for most software and"\
+ " other practical works are designed to take away your freedom to share and change the works. By contrast, our General Public"\
+ " Licenses are intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free"\
+ " software for all its users.\r\n\r\nWhen we speak of free software, we are referring to freedom, not price. Our General"\
+ " Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for"\
+ " them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces"\
+ " of it in new free programs, and that you know you can do these things.\r\n\r\nDevelopers that use our General Public Licenses"\
+ " protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License which gives you"\
+ " legal permission to copy, distribute and/or modify the software.\r\n\r\nA secondary benefit of defending all users' freedom"\
+ " is that improvements made in alternate versions of the program, if they receive widespread use, become available for other"\
+ " developers to incorporate. Many developers of free software are heartened and encouraged by the resulting cooperation."\
+ " However, in the case of software used on network servers, this result may fail to come about. The GNU General Public License"\
+ " permits making a modified version and letting the public access it on a server without ever releasing its source code to the"\
+ " public.\r\n\r\nThe GNU Affero General Public License is designed specifically to ensure that, in such cases, the modified"\
+ " source code becomes available to the community. It requires the operator of a network server to provide the source code of"\
+ " the modified version running there to the users of that server. Therefore, public use of a modified version, on a publicly"\
+ " accessible server, gives the public access to the source code of the modified version.\r\n\r\nAn older license, called the"\
+ " Affero General Public License and published by Affero, was designed to accomplish similar goals. This is a different license,"\
+ " not a version of the Affero GPL, but Affero has released a new version of the Affero GPL which permits relicensing under this"\
+ " license."
+ draft_version = create(:legislation_draft_version, body: body)
+
+ quote = "By contrast, our General Public Licenses are intended to guarantee your freedom to share and change all versions of a"\
+ " program--to make sure it remains free software for all its users.\r\n\r\nWhen we speak of free software, we are referring to"\
+ " freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of"\
+ " free software (and charge for them if you wish)"
annotation = create(:legislation_annotation,
draft_version: draft_version,
- quote: "By contrast, our General Public Licenses are intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users.\r\n\r\nWhen we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish)",
+ quote: quote,
ranges: [{"start" => "/p[2]", "startOffset" => 127, "end" => "/p[3]", "endOffset" => 223}]
)
- expect(annotation.context).to eq("The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, our General Public Licenses are intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users.\r\n\r\nWhen we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things.")
+ context = "The licenses for most software and other practical works are designed to take away your freedom to share and change the"\
+ " works. By contrast, our General Public Licenses are intended to guarantee your freedom to share"\
+ " and change all versions of a program--to make sure it remains free software for all its users.\r\n\r\nWhen we speak of"\
+ " free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have"\
+ " the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code"\
+ " or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know"\
+ " you can do these things."
+
+ expect(annotation.context).to eq(context)
end
end
diff --git a/spec/models/residence_spec.rb b/spec/models/residence_spec.rb
index 954394d1c..9ba93b2c7 100644
--- a/spec/models/residence_spec.rb
+++ b/spec/models/residence_spec.rb
@@ -25,7 +25,9 @@ describe Verification::Residence do
end
it "should validate user has allowed age" do
- residence = Verification::Residence.new("date_of_birth(3i)" => "1", "date_of_birth(2i)" => "1", "date_of_birth(1i)" => (5.years.ago.year).to_s)
+ residence = Verification::Residence.new("date_of_birth(3i)" => "1",
+ "date_of_birth(2i)" => "1",
+ "date_of_birth(1i)" => (5.years.ago.year).to_s)
expect(residence).to_not be_valid
expect(residence.errors[:date_of_birth]).to include("You don't have the required age to participate")
end
diff --git a/spec/models/verification/management/document_spec.rb b/spec/models/verification/management/document_spec.rb
index 076c68b67..d4bc4e4da 100644
--- a/spec/models/verification/management/document_spec.rb
+++ b/spec/models/verification/management/document_spec.rb
@@ -25,7 +25,10 @@ describe Verification::Management::Document do
end
it "returns false when the user is user's minimum required age" do
- census_response = double(date_of_birth: Date.new(User.minimum_required_age.years.ago.year, User.minimum_required_age.years.ago.month, User.minimum_required_age.years.ago.day))
+ date_of_birth = Date.new(User.minimum_required_age.years.ago.year,
+ User.minimum_required_age.years.ago.month,
+ User.minimum_required_age.years.ago.day)
+ census_response = double(date_of_birth: date_of_birth)
expect(Verification::Management::Document.new.under_age?(census_response)).to be false
end
diff --git a/spec/support/common_actions.rb b/spec/support/common_actions.rb
index 209ddf800..8b8470293 100644
--- a/spec/support/common_actions.rb
+++ b/spec/support/common_actions.rb
@@ -25,8 +25,9 @@ module CommonActions
end
def login_as_authenticated_manager
+ expected_response = {login: login, user_key: user_key, date: date}.with_indifferent_access
login, user_key, date = "JJB042", "31415926", Time.current.strftime("%Y%m%d%H%M%S")
- allow_any_instance_of(ManagerAuthenticator).to receive(:auth).and_return({login: login, user_key: user_key, date: date}.with_indifferent_access)
+ allow_any_instance_of(ManagerAuthenticator).to receive(:auth).and_return(expected_response)
visit management_sign_in_path(login: login, clave_usuario: user_key, fecha_conexion: date)
end
@@ -219,8 +220,11 @@ module CommonActions
end
def create_archived_proposals
- [create(:proposal, title: "This is an expired proposal", created_at: Setting["months_to_archive_proposals"].to_i.months.ago),
- create(:proposal, title: "This is an oldest expired proposal", created_at: (Setting["months_to_archive_proposals"].to_i + 2).months.ago)]
+ months_to_archive_proposals = Setting["months_to_archive_proposals"].to_i
+ [
+ create(:proposal, title: "This is an expired proposal", created_at: months_to_archive_proposals.months.ago),
+ create(:proposal, title: "This is an oldest expired proposal", created_at: (months_to_archive_proposals + 2).months.ago)
+ ]
end
def tag_names(tag_cloud)
diff --git a/spec/support/verifiable.rb b/spec/support/verifiable.rb
index 9112c67cf..9f6be1355 100644
--- a/spec/support/verifiable.rb
+++ b/spec/support/verifiable.rb
@@ -65,7 +65,8 @@ shared_examples_for "verifiable" do
user2 = create(:user, verified_at: nil, residence_verified_at: Time.current, unconfirmed_phone: nil)
user3 = create(:user, verified_at: nil, confirmed_phone: nil)
- user4 = create(:user, verified_at: Time.current, residence_verified_at: Time.current, unconfirmed_phone: "123456789", confirmed_phone: "123456789")
+ user4 = create(:user, verified_at: Time.current, residence_verified_at: Time.current,
+ unconfirmed_phone: "123456789", confirmed_phone: "123456789")
expect(model.incomplete_verification).to include(user1)
expect(model.incomplete_verification).to include(user2)
|