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

Merge pull request #4753 from consul/invalid_html

Browse Source 
Fix invalid HTML in application layout
This commit is contained in:
Javi Martín
2021-12-30 17:26:41 +01:00
committed by GitHub
parent ec352f8e09 791b2e12f7
commit 336c055484
12 changed files with 1 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/helpers/tracks_helper.rb
View File

@@ -1,12 +0,0 @@
module TracksHelper
def track_event(data = {})
track_data = ""
prefix = " data-track-event-"
data.each do |key, value|
track_data = "#{track_data}#{prefix}#{key}=#{value} "
end
content_for :track_event do
track_data
end
end
end

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

@@ -1,6 +1,7 @@
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="generator" content="Zurb Foundation for Sites 6" class="foundation-mq">
<title><%= content_for?(:title) ? yield(:title) : default_title %></title>
<% if rtl? %>
<%= stylesheet_link_tag "application-rtl" %>

1
app/views/layouts/_tracking_data.html.erb
View File

@@ -1 +0,0 @@
<meta name="tracking_data" data-track-usertype="<%= current_user ? current_user.user_type : :anonymous %>" <%= yield(:track_event) %> />

1
app/views/layouts/application.html.erb
View File

@@ -2,7 +2,6 @@
<html <%= "dir=rtl" if rtl? %> lang="<%= I18n.locale %>" data-current-user-id="<%= current_user&.id %>">
<head>
<%= render "layouts/common_head", default_title: setting["org_name"] %>
<%= render "layouts/tracking_data" %>
<%= render "layouts/meta_tags" %>
<%= content_for :canonical %>
<%= favicon_link_tag image_path_for("apple-touch-icon-200.png"),

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

@@ -4,7 +4,6 @@
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<%= render "layouts/tracking_data" %>
<%= render "layouts/meta_tags" %>
<title><%= content_for?(:title) ? yield(:title) : setting["org_name"] %></title>
<%= content_for :canonical %>

1
app/views/verification/letter/edit.html.erb
View File

@@ -1,5 +1,4 @@
<div class="row verify">
<% track_event(category: "verification", action: "edit_letter") %>
<div class="small-12 medium-9 large-6 small-centered column">
<div class="text-center">
<h1>

1
app/views/verification/letter/new.html.erb
View File

@@ -1,5 +1,4 @@
<div class="verification account row">
<% track_event(category: "verification", action: "success_sms") %>
<div class="small-12 column">
<div class="text-center">

1
app/views/verification/letter/show.html.erb
View File

@@ -1,5 +1,4 @@
<div class="row">
<% track_event(category: "verification", action: "start_letter") %>
<div class="small-12 column">
<%= back_link_to account_path, t("verification.back") %>

1
app/views/verification/residence/new.html.erb
View File

@@ -1,5 +1,4 @@
<div class="verification account row">
<% track_event(category: "verification", action: "start_census") %>
<div class="small-12 column">
<div class="text-center">

1
app/views/verification/sms/edit.html.erb
View File

@@ -1,5 +1,4 @@
<div class="verification account row">
<% track_event(category: "verification", action: "start_sms") %>
<div class="small-12 column">
<div class="text-center">

1
app/views/verification/sms/new.html.erb
View File

@@ -1,5 +1,4 @@
<div class="verification account row">
<% track_event(category: "verification", action: "success_census") %>
<div class="small-12 column">
<div class="text-center">

115
spec/system/tracks_spec.rb
View File

@@ -1,115 +0,0 @@
require "rails_helper"
describe "Tracking" do
context "Custom variable" do
scenario "Usertype anonymous" do
visit proposals_path
expect(page.html).to include "anonymous"
end
scenario "Usertype level_1_user" do
create(:geozone)
user = create(:user)
login_as(user)
visit proposals_path
expect(page.html).to include "level_1_user"
end
scenario "Usertype level_2_user" do
create(:geozone)
user = create(:user)
login_as(user)
visit account_path
click_link "Verify my account"
verify_residence
fill_in "sms_phone", with: "611111111"
click_button "Send"
user = user.reload
fill_in "sms_confirmation_code", with: user.sms_confirmation_code
click_button "Send"
expect(page.html).to include "level_2_user"
end
end
context "Tracking events" do
scenario "Verification: start census" do
user = create(:user)
login_as(user)
visit account_path
click_link "Verify my account"
expect(page).to have_selector "[data-track-event-category='verification']", visible: :all
expect(page).to have_selector "[data-track-event-action='start_census']", visible: :all
end
scenario "Verification: success census & start sms" do
create(:geozone)
user = create(:user)
login_as(user)
visit account_path
click_link "Verify my account"
verify_residence
fill_in "sms_phone", with: "611111111"
click_button "Send"
expect(page).to have_selector "[data-track-event-category='verification']", visible: :all
expect(page).to have_selector "[data-track-event-action='start_sms']", visible: :all
end
scenario "Verification: success sms" do
create(:geozone)
user = create(:user)
login_as(user)
visit account_path
click_link "Verify my account"
verify_residence
fill_in "sms_phone", with: "611111111"
click_button "Send"
user = user.reload
fill_in "sms_confirmation_code", with: user.sms_confirmation_code
click_button "Send"
expect(page).to have_selector "[data-track-event-category='verification']", visible: :all
expect(page).to have_selector "[data-track-event-action='success_sms']", visible: :all
end
scenario "Verification: letter" do
create(:geozone)
user = create(:user)
login_as(user)
visit account_path
click_link "Verify my account"
verify_residence
fill_in "sms_phone", with: "611111111"
click_button "Send"
user = user.reload
fill_in "sms_confirmation_code", with: user.sms_confirmation_code
click_button "Send"
click_link "Send me a letter with the code"
expect(page).to have_selector "[data-track-event-category='verification']", visible: :all
expect(page).to have_selector "[data-track-event-action='start_letter']", visible: :all
end
end
end