consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3699 from consul/upgrade_turbolinks

Browse Source 
Bump turbolinks to 5.2.1
This commit is contained in:
Javier Martín
2020-08-12 14:34:19 +02:00
committed by GitHub
parent a56c2d4a23 b9ce68bc82
commit b8894eac70
48 changed files with 529 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@@ -53,7 +53,7 @@ gem "sitemap_generator", "~> 6.0.2"
gem "social-share-button", "~> 1.1"
gem "sprockets", "~> 3.7.2"
gem "translator-text", "~> 0.1.0"
gem "turbolinks", "~> 2.5.3"
gem "turbolinks", "~> 5.2.1"
gem "turnout", "~> 2.4.0"
gem "uglifier", "~> 4.1.2"
gem "whenever", "~> 0.10.0", require: false

7
Gemfile.lock
View File

@@ -571,8 +571,9 @@ GEM
translator-text (0.1.0)
dry-struct (~> 0.5.0)
httparty (~> 0.15)
turbolinks (2.5.4)
coffee-rails
turbolinks (5.2.1)
turbolinks-source (~> 5.2)
turbolinks-source (5.2.0)
turnout (2.4.1)
i18n (~> 0.7)
rack (>= 1.3, < 3)
@@ -698,7 +699,7 @@ DEPENDENCIES
spring-commands-rspec (~> 1.0.4)
sprockets (~> 3.7.2)
translator-text (~> 0.1.0)
turbolinks (~> 2.5.3)
turbolinks (~> 5.2.1)
turnout (~> 2.4.0)
uglifier (~> 4.1.2)
web-console (~> 3.3.0)

21
app/assets/javascripts/application.js
View File

@@ -42,6 +42,7 @@
//= require jquery-fileupload/basic
//= require foundation
//= require turbolinks
//= require turbolinks_anchors
//= require ckeditor/loader
//= require_directory ./ckeditor
//= require social-share-button
@@ -86,7 +87,7 @@
//= require legislation
//= require legislation_allegations
//= require legislation_annotatable
//= require watch_form_changes
//= require legislation_draft_versions
//= require followable
//= require flaggable
//= require documentable
@@ -110,6 +111,7 @@
//= require cookies
//= require columns_selector
//= require budget_edit_associations
//= require datepicker
var initialize_modules = function() {
"use strict";
@@ -144,7 +146,6 @@ var initialize_modules = function() {
if ($(".legislation-annotatable").length) {
App.LegislationAnnotatable.initialize();
}
App.WatchFormChanges.initialize();
App.TreeNavigator.initialize();
App.Documentable.initialize();
App.Imageable.initialize();
@@ -166,10 +167,16 @@ var initialize_modules = function() {
App.BudgetEditAssociations.initialize();
};
$(function() {
var destroy_non_idempotent_modules = function() {
"use strict";
Turbolinks.enableProgressBar();
});
$(document).ready(initialize_modules);
$(document).on("page:load", initialize_modules);
App.ColumnsSelector.destroy();
App.Datepicker.destroy();
App.HTMLEditor.destroy();
App.LegislationAnnotatable.destroy();
App.Map.destroy();
App.SocialShare.destroy();
};
$(document).on("turbolinks:load", initialize_modules);
$(document).on("turbolinks:before-cache", destroy_non_idempotent_modules);

8
app/assets/javascripts/check_all_none.js
View File

@@ -2,13 +2,17 @@
"use strict";
App.CheckAllNone = {
initialize: function() {
$("[data-check-all]").on("click", function() {
$("[data-check-all]").on("click", function(e) {
var target_name;
e.preventDefault();
e.stopPropagation();
target_name = $(this).data("check-all");
$("[name='" + target_name + "']").prop("checked", true);
});
$("[data-check-none]").on("click", function() {
$("[data-check-none]").on("click", function(e) {
var target_name;
e.preventDefault();
e.stopPropagation();
target_name = $(this).data("check-none");
$("[name='" + target_name + "']").prop("checked", false);
});

3
app/assets/javascripts/columns_selector.js
View File

@@ -85,6 +85,9 @@
$(".column-selectable").on("inserted", function() {
App.ColumnsSelector.initColumns();
});
},
destroy: function() {
$("#js-columns-selector-wrapper").children(":not(#column_selector_item_template)").remove();
}
};
}).call(this);

31
app/assets/javascripts/datepicker.js Normal file
View File

@@ -0,0 +1,31 @@
// Based on code by Javan Makhmali
// https://github.com/turbolinks/turbolinks/issues/253#issuecomment-289101048
// The jQuery UI date picker widget appends a shared element to the
// body which it expects will never leave the page, but Turbolinks
// removes that shared element when it rerenders. We satisfy that
// expectation by removing the shared element from the page before
// Turbolinks caches the page, and appending it again before
// Turbolinks swaps the new body in during rendering.
//
// Additionally, returning to the cached version of a page that
// previously had date picker elements would result in those date
// pickers not being initialized again. We fix this issue by finding
// all initialized date picker inputs on the page and calling the
// date picker's destroy method before Turbolinks caches the page.
(function() {
"use strict";
App.Datepicker = {
destroy: function() {
$.datepicker.dpDiv.remove();
document.querySelectorAll("input.hasDatepicker").forEach(function(input) {
$(input).datepicker("hide");
$(input).datepicker("destroy");
});
}
};
document.addEventListener("turbolinks:before-render", function(event) {
$.datepicker.dpDiv.appendTo(event.data.newBody);
});
}).call(this);

13
app/assets/javascripts/html_editor.js
View File

@@ -1,11 +1,6 @@
(function() {
"use strict";
App.HTMLEditor = {
destroy: function() {
for (var name in CKEDITOR.instances) {
CKEDITOR.instances[name].destroy();
}
},
initialize: function() {
$("textarea.html-area").each(function() {
if ($(this).hasClass("admin")) {
@@ -14,9 +9,11 @@
CKEDITOR.replace(this.name, { language: $("html").attr("lang") });
}
});
},
destroy: function() {
for (var name in CKEDITOR.instances) {
CKEDITOR.instances[name].destroy();
}
}
};
$(document).on("page:before-unload", App.HTMLEditor.destroy);
$(document).on("page:restore", App.HTMLEditor.initialize);
}).call(this);

16
app/assets/javascripts/legislation_annotatable.js
View File

@@ -186,6 +186,15 @@
}
};
},
initCommentFormToggler: function() {
$("body").on("click", ".comment-box a.publish-comment", function(e) {
e.preventDefault();
var annotation_id = $(this).closest(".comment-box").data("id");
$("a.publish-comment").hide();
$("#js-comment-form-annotation-" + annotation_id).toggle();
$("#js-comment-form-annotation-" + annotation_id + " textarea").trigger("focus");
});
},
initialize: function() {
var current_user_id;
$("body").on("renderLegislationAnnotation", App.LegislationAnnotatable.renderAnnotationComments);
@@ -226,6 +235,13 @@
});
});
});
App.LegislationAnnotatable.initCommentFormToggler();
},
destroy: function() {
if ($(".legislation-annotatable").length > 0) {
App.LegislationAnnotatable.app.destroy();
}
}
};
}).call(this);

22
app/assets/javascripts/legislation_draft_versions.js Normal file
View File

@@ -0,0 +1,22 @@
(function() {
"use strict";
App.LegislationDraftVersions = {
msg: function() {
return $("[data-markdown-changes-message]").data("markdown-changes-message");
},
hasChanged: function() {
return $(".markdown-editor textarea").is(function() {
return this.value !== this.defaultValue;
});
},
checkChanges: function() {
if (App.LegislationDraftVersions.hasChanged()) {
return confirm(App.LegislationDraftVersions.msg());
} else {
return true;
}
},
};
$(document).on("turbolinks:before-visit", App.LegislationDraftVersions.checkChanges);
}).call(this);

8
app/assets/javascripts/managers.js
View File

@@ -17,10 +17,14 @@
$("#user_password").prop("type", type);
},
initialize: function() {
$(".generate-random-value").on("click", function() {
$(".generate-random-value").on("click", function(e) {
e.preventDefault();
e.stopPropagation();
$("#user_password").val(App.Managers.generatePassword());
});
$(".show-password").on("click", function() {
$(".show-password").on("click", function(e) {
e.preventDefault();
e.stopPropagation();
if ($("#user_password").is("input[type='password']")) {
App.Managers.togglePassword("text");
} else {

51
app/assets/javascripts/map.js
View File

@@ -1,6 +1,7 @@
(function() {
"use strict";
App.Map = {
maps: [],
initialize: function() {
$("*[data-map]:visible").each(function() {
App.Map.initializeMap(this);
@@ -11,19 +12,53 @@
}
});
},
destroy: function() {
App.Map.maps.forEach(function(map) {
map.off();
map.remove();
});
App.Map.maps = [];
},
initializeMap: function(element) {
var addMarkerInvestments, clearFormfields, createMarker, editable, getPopupContent, latitudeInputSelector, longitudeInputSelector, map, mapAttribution, mapCenterLatLng, mapCenterLatitude, mapCenterLongitude, mapTilesProvider, marker, markerIcon, markerLatitude, markerLongitude, moveOrPlaceMarker, openMarkerPopup, removeMarker, removeMarkerSelector, updateFormfields, zoom, zoomInputSelector;
var addMarkerInvestments, clearFormfields, createMarker, dataCoordinates, editable, formCoordinates,
getPopupContent, latitudeInputSelector, longitudeInputSelector, map, mapAttribution, mapCenterLatLng,
mapCenterLatitude, mapCenterLongitude, mapTilesProvider, marker, markerIcon, markerLatitude,
markerLongitude, moveOrPlaceMarker, openMarkerPopup, removeMarker, removeMarkerSelector,
updateFormfields, zoom, zoomInputSelector;
App.Map.cleanInvestmentCoordinates(element);
mapCenterLatitude = $(element).data("map-center-latitude");
mapCenterLongitude = $(element).data("map-center-longitude");
markerLatitude = $(element).data("marker-latitude");
markerLongitude = $(element).data("marker-longitude");
zoom = $(element).data("map-zoom");
mapTilesProvider = $(element).data("map-tiles-provider");
mapAttribution = $(element).data("map-tiles-provider-attribution");
latitudeInputSelector = $(element).data("latitude-input-selector");
longitudeInputSelector = $(element).data("longitude-input-selector");
zoomInputSelector = $(element).data("zoom-input-selector");
formCoordinates = {
lat: $(latitudeInputSelector).val(),
long: $(longitudeInputSelector).val(),
zoom: $(zoomInputSelector).val()
};
dataCoordinates = {
lat: $(element).data("marker-latitude"),
long: $(element).data("marker-longitude")
};
if (App.Map.validCoordinates(formCoordinates)) {
markerLatitude = formCoordinates.lat;
markerLongitude = formCoordinates.long;
mapCenterLatitude = formCoordinates.lat;
mapCenterLongitude = formCoordinates.long;
} else if (App.Map.validCoordinates(dataCoordinates)) {
markerLatitude = dataCoordinates.lat;
markerLongitude = dataCoordinates.long;
mapCenterLatitude = dataCoordinates.lat;
mapCenterLongitude = dataCoordinates.lat;
} else {
mapCenterLatitude = $(element).data("map-center-latitude");
mapCenterLongitude = $(element).data("map-center-longitude");
}
if (App.Map.validZoom(formCoordinates.zoom)) {
zoom = formCoordinates.zoom;
} else {
zoom = $(element).data("map-zoom");
}
removeMarkerSelector = $(element).data("marker-remove-selector");
addMarkerInvestments = $(element).data("marker-investments-coordinates");
editable = $(element).data("marker-editable");
@@ -88,6 +123,7 @@
};
mapCenterLatLng = new L.LatLng(mapCenterLatitude, mapCenterLongitude);
map = L.map(element.id).setView(mapCenterLatLng, zoom);
App.Map.maps.push(map);
L.tileLayer(mapTilesProvider, {
attribution: mapAttribution
}).addTo(map);
@@ -125,6 +161,9 @@
$(element).attr("data-marker-investments-coordinates", clean_markers);
}
},
validZoom: function(zoom) {
return App.Map.isNumeric(zoom);
},
validCoordinates: function(coordinates) {
return App.Map.isNumeric(coordinates.lat) && App.Map.isNumeric(coordinates.long);
},

16
app/assets/javascripts/markdown_editor.js
View File

@@ -22,14 +22,26 @@
});
editor = $(this);
editor.on("input", function() {
var textarea, warning;
textarea = editor.find("textarea")[0];
warning = $(this).closest(".translatable-fields").find(".warning");
App.MarkdownEditor.refresh_preview($(this), md);
$(".legislation-draft-versions-edit .warning").show();
if (textarea.value === textarea.defaultValue) {
warning.hide();
} else {
warning.show();
}
});
editor.find("textarea").on("scroll", function() {
editor.find(".markdown-preview").scrollTop($(this).scrollTop());
});
editor.find(".fullscreen-toggle").on("click", function() {
editor.find(".fullscreen-toggle").on("click", function(e) {
var span;
e.preventDefault();
e.stopPropagation();
editor.toggleClass("fullscreen");
$(".fullscreen-container").toggleClass("medium-8", "medium-12");
span = $(this).find("span");

6
app/assets/javascripts/settings.js
View File

@@ -3,12 +3,8 @@
App.Settings = {
initialize: function() {
$("#settings-tabs").on("change.zf.tabs", function() {
var map_container;
if ($("#tab-map-configuration:visible").length) {
map_container = L.DomUtil.get("admin-map");
if (map_container !== null) {
map_container._leaflet_id = null;
}
App.Map.destroy();
App.Map.initialize();
}
});

3
app/assets/javascripts/social_share.js
View File

@@ -5,6 +5,9 @@
$(".social-share-button a").each(function() {
$(this).append("<span class='show-for-sr'>" + ($(this).data("site")) + "</span>");
});
},
destroy: function() {
$(".social-share-button a .show-for-sr").remove();
}
};
}).call(this);

3
app/assets/javascripts/stat_graphs.js
View File

@@ -9,6 +9,5 @@ var initialize_stats_modules = function() {
App.Stats.initialize();
};
$(document).ready(initialize_stats_modules);
$(document).on("page:load", initialize_stats_modules);
$(document).on("turbolinks:load", initialize_stats_modules);
$(document).on("ajax:complete", initialize_stats_modules);

15
app/assets/javascripts/turbolinks_anchors.js Normal file
View File

@@ -0,0 +1,15 @@
(function() {
"use strict";
// Code by Dom Christie:
// https://github.com/turbolinks/turbolinks/issues/75#issuecomment-443256173
document.addEventListener("turbolinks:click", function(event) {
if (event.target.getAttribute("href").charAt(0) === "#") {
Turbolinks.controller.pushHistoryWithLocationAndRestorationIdentifier(
event.data.url,
Turbolinks.uuid()
);
event.preventDefault();
}
});
}).call(this);

32
app/assets/javascripts/watch_form_changes.js
View File

@@ -1,32 +0,0 @@
(function() {
"use strict";
App.WatchFormChanges = {
forms: function() {
return $("form[data-watch-changes]");
},
msg: function() {
return $("[data-watch-form-message]").data("watch-form-message");
},
hasChanged: function() {
return App.WatchFormChanges.forms().is(function() {
return $(this).serialize() !== $(this).data("watchChanges");
});
},
checkChanges: function() {
if (App.WatchFormChanges.hasChanged()) {
return confirm(App.WatchFormChanges.msg());
} else {
return true;
}
},
initialize: function() {
if (App.WatchFormChanges.forms().length === 0 || App.WatchFormChanges.msg() === undefined) {
return;
}
$(document).off("page:before-change").on("page:before-change", App.WatchFormChanges.checkChanges);
App.WatchFormChanges.forms().each(function() {
$(this).data("watchChanges", $(this).serialize());
});
}
};
}).call(this);

2
app/views/admin/budget_investments/show.html.erb
View File

@@ -1,5 +1,5 @@
<%= link_to admin_budget_budget_investments_path(Budget::Investment.filter_params(params).to_h),
class: "back", data: { no_turbolink: true } do %>
class: "back", data: { turbolinks: false } do %>
<span class="icon-angle-left"></span><%= t("shared.back") %>
<% end %>

9
app/views/admin/legislation/draft_versions/_form.html.erb
View File

@@ -1,11 +1,18 @@
<%= render "shared/globalize_locales", resource: @draft_version %>
<%= translatable_form_for [:admin, @process, @draft_version], url: url, html: { data: { watch_changes: true }} do |f| %>
<%= translatable_form_for [:admin, @process, @draft_version], url: url,
html: { data: { markdown_changes_message: I18n.t("admin.legislation.draft_versions.edit.markdown_changes_message") }} do |f| %>
<%= render "shared/errors", resource: @draft_version %>
<div class="row">
<%= f.translatable_fields do |translations_form| %>
<div class="small-12 column">
<div class="callout warning" style="display: none;">
<%= t("admin.legislation.draft_versions.edit.warning") %>
</div>
</div>
<div class="small-12 medium-9 column">
<%= translations_form.text_field :title,
placeholder: t("admin.legislation.draft_versions.form.title_placeholder") %>

6
app/views/admin/legislation/draft_versions/edit.html.erb
View File

@@ -11,12 +11,6 @@
<%= render "admin/legislation/processes/subnav", process: @process, active: "draft_versions" %>
<div class="small-12 column">
<div class="callout warning" style="display: none;">
<%= t("admin.legislation.draft_versions.edit.warning") %>
</div>
</div>
<div class="small-12 column">
<h3 class="inline-block"><%= @draft_version.title %></h3>

2
app/views/admin/legislation/homepages/_form.html.erb
View File

@@ -3,7 +3,7 @@
display_style: lambda { |locale| enable_translation_style(@process, locale) },
manage_languages: false %>
<%= translatable_form_for [:admin, @process], url: url, html: { data: { watch_changes: true } } do |f| %>
<%= translatable_form_for [:admin, @process], url: url do |f| %>
<%= render "shared/errors", resource: @process %>
<div class="row">

2
app/views/admin/legislation/processes/_form.html.erb
View File

@@ -1,6 +1,6 @@
<%= render "shared/globalize_locales", resource: @process %>
<%= translatable_form_for [:admin, @process], html: { data: { watch_changes: true } } do |f| %>
<%= translatable_form_for [:admin, @process] do |f| %>
<%= render "shared/errors", resource: @process %>

2
app/views/admin/legislation/proposals/_form.html.erb
View File

@@ -1,4 +1,4 @@
<%= form_for [:admin, @process], html: { data: { watch_changes: true } } do |f| %>
<%= form_for [:admin, @process] do |f| %>
<%= render "shared/errors", resource: @process %>

2
app/views/admin/legislation/questions/_form.html.erb
View File

@@ -1,6 +1,6 @@
<%= render "shared/globalize_locales", resource: @question %>
<%= translatable_form_for [:admin, @process, @question], url: url, html: { data: { watch_changes: true } } do |f| %>
<%= translatable_form_for [:admin, @process, @question], url: url do |f| %>
<%= render "shared/errors", resource: @question %>

2
app/views/admin/site_customization/content_blocks/_form_content_block.html.erb
View File

@@ -1,4 +1,4 @@
<%= form_for [:admin, @content_block], html: { class: "edit_page", data: { watch_changes: true } } do |f| %>
<%= form_for [:admin, @content_block], html: { class: "edit_page" } do |f| %>
<%= render "shared/errors", resource: @content_block %>

2
app/views/admin/site_customization/pages/_form.html.erb
View File

@@ -1,6 +1,6 @@
<%= render "shared/globalize_locales", resource: @page %>
<%= translatable_form_for [:admin, @page], html: { class: "edit_page", data: { watch_changes: true } } do |f| %>
<%= translatable_form_for [:admin, @page], html: { class: "edit_page" } do |f| %>
<%= render "shared/errors", resource: @page %>
<div class="row">

2
app/views/admin/stats/budget_supporting.html.erb
View File

@@ -1,5 +1,5 @@
<% content_for :head do %>
<%= javascript_include_tag "stat_graphs", "data-turbolinks-track" => true %>
<%= javascript_include_tag "stat_graphs", "data-turbolinks-track" => "reload" %>
<% end %>
<%= back_link_to budgets_admin_stats_path %>

2
app/views/admin/stats/graph.html.erb
View File

@@ -1,5 +1,5 @@
<% content_for :head do %>
<%= javascript_include_tag "stat_graphs", "data-turbolinks-track" => true %>
<%= javascript_include_tag "stat_graphs", "data-turbolinks-track" => "reload" %>
<% end %>
<%= render "graph", name: @name, event: @event, count: @count %>

2
app/views/budgets/groups/show.html.erb
View File

@@ -36,7 +36,7 @@
<%= link_to heading.name,
budget_investments_path(heading_id: heading.id,
filter: @current_filter),
data: { no_turbolink: true } %><br>
data: { turbolinks: false } %><br>
</span>
<% end %>
</div>

2
app/views/budgets/show.html.erb
View File

@@ -64,7 +64,7 @@
budget_investments_path(@budget,
heading_id: group.headings.first.id,
filter: @current_filter),
data: { no_turbolink: true } %>
data: { turbolinks: false } %>
<% else %>
<%= link_to group.name,
budget_group_path(@budget, group,

2
app/views/dashboard/progress.html.erb
View File

@@ -29,7 +29,7 @@
class="c3 proposal-graph"></div>
</div>
<%= javascript_include_tag "dashboard_graphs", "data-turbolinks-track" => true %>
<%= javascript_include_tag "dashboard_graphs", "data-turbolinks-track" => "reload" %>
<% end %>
<%= render "next_goal" %>

2
app/views/layouts/_common_head.html.erb
View File

@@ -3,7 +3,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<title><%= content_for?(:title) ? yield(:title) : default_title %></title>
<%= stylesheet_link_tag "application" %>
<%= javascript_include_tag "application", "data-turbolinks-track" => true %>
<%= javascript_include_tag "application", "data-turbolinks-track" => "reload" %>
<%= csrf_meta_tags %>
<%= favicon_link_tag "favicon.ico" %>
<%= render "layouts/disable_animations_in_tests" if Rails.env.test? %>

2
app/views/layouts/admin.html.erb
View File

@@ -6,7 +6,7 @@
<%= content_for :head %>
</head>
<body class="admin" data-watch-form-message="<%= I18n.t("layouts.admin.watch_form_message") %>">
<body class="admin">
<div class="off-canvas-wrapper">
<div class="off-canvas-wrapper-inner" data-off-canvas-wrapper>
<div class="off-canvas position-left" id="offCanvas" data-off-canvas>

2
app/views/layouts/dashboard.html.erb
View File

@@ -9,7 +9,7 @@
<title><%= content_for?(:title) ? yield(:title) : setting["org_name"] %></title>
<%= content_for :canonical %>
<%= stylesheet_link_tag "application" %>
<%= javascript_include_tag "application", "data-turbolinks-track" => true %>
<%= javascript_include_tag "application", "data-turbolinks-track" => "reload" %>
<%= csrf_meta_tags %>
<%= favicon_link_tag "favicon.ico" %>
<%= favicon_link_tag image_path_for("apple-touch-icon-200.png"),

2
app/views/layouts/proposals_dashboard.html.erb
View File

@@ -9,7 +9,7 @@
<title><%= content_for?(:title) ? yield(:title) : setting["org_name"] %></title>
<%= content_for :canonical %>
<%= stylesheet_link_tag "application" %>
<%= javascript_include_tag "application", "data-turbolinks-track" => true %>
<%= javascript_include_tag "application", "data-turbolinks-track" => "reload" %>
<%= csrf_meta_tags %>
<%= favicon_link_tag "favicon.ico" %>
<%= favicon_link_tag image_path_for("apple-touch-icon-200.png"),

2
app/views/legislation/annotations/_comments_box.html.erb
View File

@@ -1,4 +1,4 @@
<div class="comment-box" id="comments-box-<%= annotation.id %>">
<div class="comment-box" id="comments-box-<%= annotation.id %>" data-id="<%= annotation.id %>">
<div class="comment-header">
<%= render "comment_header", annotation: annotation %>
</div>

10
app/views/legislation/annotations/_comments_box_form.js.erb
View File

@@ -1,13 +1,3 @@
$("#comments-box-<%= annotation.id %> a.publish-comment").on({
click: function(e) {
e.preventDefault();
$("a.publish-comment").hide();
$("#js-comment-form-annotation-<%= annotation.id %>").toggle();
$("#js-comment-form-annotation-<%= annotation.id %> textarea").focus();
return;
}
});
<% if comment.errors.any? %>
$("#comments-box-<%= @annotation.id %> a.publish-comment").hide();
$("#js-comment-form-annotation-<%= annotation.id %>").toggle();

1
config/locales/en/admin.yml
View File

@@ -554,6 +554,7 @@ en:
back: Back
submit_button: Save changes
warning: You've edited the text, don't forget to click on Save to permanently save the changes.
markdown_changes_message: "You've edited the text without saving it. Do you confirm to leave the page?"
form:
title: 'Editing <span class="strong">%{draft_version_title}</span> from the process <span class="strong">%{process_title}</span>'
launch_text_editor: Launch text editor

2
config/locales/en/general.yml
View File

@@ -252,8 +252,6 @@ en:
other: You have %{count} new notifications
notifications: Notifications
no_notifications: "You don't have new notifications"
admin:
watch_form_message: "You have unsaved changes. Do you confirm to leave the page?"
notifications:
index:
empty_notifications: You don't have new notifications.

1
config/locales/es/admin.yml
View File

@@ -553,6 +553,7 @@ es:
back: Volver
submit_button: Guardar cambios
warning: Ojo, has editado el texto. Para conservar de forma permanente los cambios, no te olvides de hacer click en Guardar.
markdown_changes_message: "Ojo, has editado el texto; perderás los cambios si abandonas la página. ¿Seguro que quieres continuar?"
form:
title: 'Editando <span class="strong">%{draft_version_title}</span> del proceso <span class="strong">%{process_title}</span>'
launch_text_editor: Lanzar editor de texto

2
config/locales/es/general.yml
View File

@@ -252,8 +252,6 @@ es:
other: Tienes %{count} notificaciones nuevas
notifications: Notificaciones
no_notifications: "No tienes notificaciones nuevas"
admin:
watch_form_message: "Has realizado cambios que no han sido guardados. ¿Seguro que quieres abandonar la página?"
notifications:
index:
empty_notifications: No tienes notificaciones nuevas.

105
spec/shared/system/mappable.rb
View File

@@ -79,6 +79,95 @@ shared_examples "mappable" do |mappable_factory_name, mappable_association_name,
expect(page).to have_content "Map location can't be blank"
end
describe "When restoring the page from browser history" do
scenario "map should not be duplicated", :js do
do_login_for user
visit send(mappable_new_path, arguments)
if management
click_link "Select user"
expect(page).to have_content "User management"
else
click_link "Help"
expect(page).to have_content "CONSUL is a platform for citizen participation"
end
go_back
within ".map_location" do
expect(page).to have_css(".leaflet-map-pane", count: 1)
end
end
scenario "keeps marker and zoom defined by the user", :js do
do_login_for user
visit send(mappable_new_path, arguments)
within ".map_location" do
expect(page).not_to have_css(".map-icon")
end
expect(page.execute_script("return App.Map.maps[0].getZoom();")).to eq(10)
map_zoom_in
find("#new_map_location").click
within ".map_location" do
expect(page).to have_css(".map-icon")
end
if management
click_link "Select user"
expect(page).to have_content "User management"
else
click_link "Help"
expect(page).to have_content "CONSUL is a platform for citizen participation"
end
go_back
within ".map_location" do
expect(page).to have_css(".map-icon")
expect(page.execute_script("return App.Map.maps[0].getZoom();")).to eq(11)
end
end
scenario "shows marker at map center", :js do
do_login_for user
visit send(mappable_new_path, arguments)
within ".map_location" do
expect(page).not_to have_css(".map-icon")
end
place_map_at(-68.592487, -62.391357)
find("#new_map_location").click
within ".map_location" do
expect(page).to have_css(".map-icon")
end
if management
click_link "Select user"
expect(page).to have_content "User management"
else
click_link "Help"
expect(page).to have_content "CONSUL is a platform for citizen participation"
end
go_back
within ".map_location" do
expect(page).to have_css(".map-icon")
end
end
end
scenario "Skip map", :js do
do_login_for user
visit send(mappable_new_path, arguments)
@@ -270,3 +359,19 @@ def set_arguments(arguments, mappable, mappable_path_arguments)
arguments.merge!("#{argument_name}": mappable.send(path_to_value))
end
end
def map_zoom_in
initial_zoom = page.execute_script("return App.Map.maps[0].getZoom();")
find(".leaflet-control-zoom-in").click
until page.execute_script("return App.Map.maps[0].getZoom() === #{initial_zoom + 1};") do
sleep 0.01
end
end
def place_map_at(latitude, longitude)
page.execute_script("App.Map.maps[0].setView(new L.LatLng(#{latitude}, #{longitude}))")
until page.execute_script("return App.Map.maps[0].getCenter().lat === #{latitude};") do
sleep 0.01
end
end

9
spec/support/common_actions/verifications.rb
View File

@@ -55,4 +55,13 @@ module Verifications
within_frame(0) { find("body").set(with) }
end
end
def fill_in_markdown_editor(label, with:)
click_link "Launch text editor"
fill_in label, with: with
within(".fullscreen") do
click_link "Close text editor"
end
end
end

28
spec/system/admin/banners_spec.rb
View File

@@ -190,6 +190,34 @@ describe "Admin banners magement" do
expect(page).to have_field "Post started at", with: "22/02/2002"
end
scenario "when date picker is opened and click on browser history back datepicker is closed", :js do
banner = create(:banner)
visit admin_banners_path(banner)
click_link "Edit banner"
find_field("Post started at").click
expect(page).to have_css "#ui-datepicker-div"
go_back
expect(page).to have_content("Banners")
expect(page).not_to have_css "#ui-datepicker-div"
end
scenario "date picker works after using the browser back button", :js do
banner = create(:banner)
visit edit_admin_banner_path(banner)
click_link "Manage banners"
expect(page).to have_link "Edit banner"
go_back
find_field("Post started at").click
expect(page).to have_css "#ui-datepicker-div"
end
scenario "Delete a banner" do
create(:banner, title: "Ugly banner",
description: "Bad text",

22
spec/system/admin/budget_investments_spec.rb
View File

@@ -1877,5 +1877,27 @@ describe "Admin budget investments" do
expect(page).not_to have_content "Don't display me, please!"
end
end
scenario "When restoring the page from browser history renders columns selectors only once", :js do
visit admin_budget_budget_investments_path(budget)
click_link "Proposals"
expect(page).to have_content("There are no proposals.")
go_back
within("#js-columns-selector") do
find("strong", text: "Columns").click
end
within("#js-columns-selector-wrapper") do
selectable_columns.each do |column|
check_text = I18n.t("admin.budget_investments.index.list.#{column}")
expect(page).to have_content(check_text, count: 1)
end
end
end
end
end

72
spec/system/admin/legislation/draft_versions_spec.rb
View File

@@ -83,18 +83,74 @@ describe "Admin legislation draft versions" do
click_link "Version 1"
fill_in "Version title", with: "Version 1b"
click_link "Launch text editor"
fill_in "Text", with: "# Version 1 body\r\n\r\nParagraph\r\n\r\n>Quote"
within(".fullscreen") do
click_link "Close text editor"
end
fill_in_markdown_editor "Text", with: "# Version 1 body\r\n\r\nParagraph\r\n\r\n>Quote"
click_button "Save changes"
expect(page).to have_content "Version 1b"
end
end
context "Changing content with the markdown editor", :js do
let(:prompt) { "You've edited the text without saving it. Do you confirm to leave the page?" }
let(:version) { create(:legislation_draft_version, body: "Version 1") }
let(:path) do
edit_admin_legislation_process_draft_version_path(version.process, version)
end
scenario "asks for confimation when the content is modified" do
visit path
fill_in_markdown_editor "Text", with: "Version 1b"
expect(page).to have_content "You've edited the text"
dismiss_confirm(prompt) do
click_link "Proposals", match: :first
end
expect(page).to have_current_path(path)
end
scenario "asks for confimation after the page is restored from browser history" do
visit path
fill_in_markdown_editor "Text", with: "Version 1b"
accept_confirm(prompt) do
click_link "Proposals", match: :first
end
expect(page).to have_css("h2", text: "Proposals")
go_back
expect(page).to have_content version.process.title
accept_confirm(prompt) do
click_link "Proposals", match: :first
end
expect(page).to have_css("h2", text: "Proposals")
end
scenario "does not ask for confirmation when restoring the original content" do
visit path
fill_in_markdown_editor "Text", with: "Version 1b"
accept_confirm(prompt) do
click_link "Proposals", match: :first
end
expect(page).to have_css("h2", text: "Proposals")
go_back
fill_in_markdown_editor "Text", with: "Version 1"
expect(page).not_to have_content "You've edited the text"
click_link "Proposals", match: :first
expect(page).to have_css("h2", text: "Proposals")
end
end
end

39
spec/system/legislation/draft_versions_spec.rb
View File

@@ -237,6 +237,45 @@ describe "Legislation Draft Versions" do
expect(page).to have_content "Comment can't be blank"
end
scenario "When page is restored from browser cache do not duplicate annotation handlers" do
create(:legislation_annotation, draft_version: draft_version, text: "my annotation")
visit legislation_process_draft_version_path(draft_version.process, draft_version)
expect(page).to have_css(".annotator-hl", count: 1)
click_link "Help"
expect(page).to have_content "CONSUL is a platform for citizen participation"
go_back
expect(page).to have_content "A collaborative legislation process"
expect(page).to have_css(".annotator-hl", count: 1)
end
scenario "When page is restored from browser cache publish comment button keeps working" do
create(:legislation_annotation, draft_version: draft_version, text: "my annotation")
visit legislation_process_draft_version_path(draft_version.process, draft_version)
find(:css, ".annotator-hl").click
click_link "Help"
expect(page).to have_content "CONSUL is a platform for citizen participation"
go_back
expect(page).to have_content "A collaborative legislation process"
click_link "Publish Comment"
fill_in "comment[body]", with: "My interesting comment"
click_button "Publish comment"
expect(page).to have_content "My interesting comment"
end
end
context "Merged annotations", :js do

48
spec/system/proposals_spec.rb
View File

@@ -198,6 +198,18 @@ describe "Proposals" do
expect(page).not_to have_link("No comments", href: "#comments")
end
end
scenario "After using the browser's back button, social buttons will have one screen reader", :js do
proposal = create(:proposal)
visit proposal_path(proposal)
click_link "Help"
expect(page).to have_content "CONSUL is a platform for citizen participation"
go_back
expect(page).to have_css "span.show-for-sr", text: "twitter", count: 1
end
end
describe "Show sticky support button on mobile screens", :js do
@@ -233,6 +245,42 @@ describe "Proposals" do
expect(page).not_to have_css(".is-anchored")
end
end
scenario "After using the browser's back button" do
proposal = create(:proposal)
visit proposal_path(proposal)
click_link "Go back"
expect(page).to have_link proposal.title
go_back
within("#proposal_sticky") do
expect(page).to have_css(".is-stuck")
expect(page).not_to have_css(".is-anchored")
end
end
scenario "After using the browser's forward button" do
proposal = create(:proposal)
visit proposals_path
click_link proposal.title
expect(page).not_to have_link proposal.title
go_back
expect(page).to have_link proposal.title
go_forward
within("#proposal_sticky") do
expect(page).to have_css(".is-stuck")
expect(page).not_to have_css(".is-anchored")
end
end
end
context "Embedded video" do