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

Fixes houndci-bot warnings

Browse Source
This commit is contained in:
decabeza
2018-10-30 18:49:05 +01:00
parent 747aec3506
commit 884580206a
4 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/site_customization/content_block.rb
View File

@@ -1,5 +1,5 @@
class SiteCustomization::ContentBlock < ActiveRecord::Base class SiteCustomization::ContentBlock < ActiveRecord::Base
VALID_BLOCKS = %w(top_links footer subnavigation_left subnavigation_right) VALID_BLOCKS = %w[top_links footer subnavigation_left subnavigation_right]
validates :locale, presence: true, inclusion: { in: I18n.available_locales.map(&:to_s) } validates :locale, presence: true, inclusion: { in: I18n.available_locales.map(&:to_s) }
validates :name, presence: true, uniqueness: { scope: :locale }, inclusion: { in: VALID_BLOCKS } validates :name, presence: true, uniqueness: { scope: :locale }, inclusion: { in: VALID_BLOCKS }

6
spec/features/admin/site_customization/content_blocks_spec.rb
View File

@@ -27,7 +27,8 @@ feature "Admin custom content blocks" do
click_link "Create new content block" click_link "Create new content block"
select I18n.t("admin.site_customization.content_blocks.content_block.names.footer"), from: "site_customization_content_block_name" select I18n.t("admin.site_customization.content_blocks.content_block.names.footer"),
from: "site_customization_content_block_name"
select "es", from: "site_customization_content_block_locale" select "es", from: "site_customization_content_block_locale"
fill_in "site_customization_content_block_body", with: "Some custom content" fill_in "site_customization_content_block_body", with: "Some custom content"
@@ -50,7 +51,8 @@ feature "Admin custom content blocks" do
click_link "Create new content block" click_link "Create new content block"
select I18n.t("admin.site_customization.content_blocks.content_block.names.top_links"), from: "site_customization_content_block_name" select I18n.t("admin.site_customization.content_blocks.content_block.names.top_links"),
from: "site_customization_content_block_name"
select "en", from: "site_customization_content_block_locale" select "en", from: "site_customization_content_block_locale"
fill_in "site_customization_content_block_body", with: "Some custom content" fill_in "site_customization_content_block_body", with: "Some custom content"

3
spec/features/admin/site_customization/information_texts_spec.rb
View File

@@ -50,7 +50,8 @@ feature "Admin custom information texts" do
visit admin_site_customization_information_texts_path visit admin_site_customization_information_texts_path
click_link 'Proposals' click_link 'Proposals'
expect(find("a[href=\"/admin/site_customization/information_texts?tab=proposals\"].is-active")).to have_content "Proposals" expect(find("a[href=\"/admin/site_customization/information_texts?tab=proposals\"].is-active"))
.to have_content "Proposals"
end end
context "Globalization" do context "Globalization" do

24
spec/features/site_customization/content_blocks_spec.rb
View File

@@ -2,8 +2,10 @@ require 'rails_helper'
feature "Custom content blocks" do feature "Custom content blocks" do
scenario "top links" do scenario "top links" do
create(:site_customization_content_block, name: "top_links", locale: "en", body: "content for top links") create(:site_customization_content_block, name: "top_links", locale: "en",
create(:site_customization_content_block, name: "top_links", locale: "es", body: "contenido para top links") body: "content for top links")
create(:site_customization_content_block, name: "top_links", locale: "es",
body: "contenido para top links")
visit "/?locale=en" visit "/?locale=en"
@@ -17,8 +19,10 @@ feature "Custom content blocks" do
end end
scenario "footer" do scenario "footer" do
create(:site_customization_content_block, name: "footer", locale: "en", body: "content for footer") create(:site_customization_content_block, name: "footer", locale: "en",
create(:site_customization_content_block, name: "footer", locale: "es", body: "contenido para footer") body: "content for footer")
create(:site_customization_content_block, name: "footer", locale: "es",
body: "contenido para footer")
visit "/?locale=en" visit "/?locale=en"
@@ -32,8 +36,10 @@ feature "Custom content blocks" do
end end
scenario "main navigation left" do scenario "main navigation left" do
create(:site_customization_content_block, name: "subnavigation_left", locale: "en", body: "content for left links") create(:site_customization_content_block, name: "subnavigation_left", locale: "en",
create(:site_customization_content_block, name: "subnavigation_left", locale: "es", body: "contenido para left links") body: "content for left links")
create(:site_customization_content_block, name: "subnavigation_left", locale: "es",
body: "contenido para left links")
visit "/?locale=en" visit "/?locale=en"
@@ -47,8 +53,10 @@ feature "Custom content blocks" do
end end
scenario "main navigation right" do scenario "main navigation right" do
create(:site_customization_content_block, name: "subnavigation_right", locale: "en", body: "content for right links") create(:site_customization_content_block, name: "subnavigation_right", locale: "en",
create(:site_customization_content_block, name: "subnavigation_right", locale: "es", body: "contenido para right links") body: "content for right links")
create(:site_customization_content_block, name: "subnavigation_right", locale: "es",
body: "contenido para right links")
visit "/?locale=en" visit "/?locale=en"