Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ GEM
bcrypt (3.1.16)
before_renders (0.2.0)
bigdecimal (3.1.8)
bootsnap (1.18.3)
bootsnap (1.18.4)
msgpack (~> 1.2)
builder (3.3.0)
capybara (3.40.0)
Expand Down Expand Up @@ -352,7 +352,7 @@ GEM
minitest-stub_any_instance (1.0.2)
mocha (2.1.0)
ruby2_keywords (>= 0.0.5)
msgpack (1.7.2)
msgpack (1.8.0)
multi_json (1.15.0)
multipart-post (2.4.1)
net-http-digest_auth (1.4.1)
Expand Down
1 change: 1 addition & 0 deletions app/controllers/gobierto_people/welcome_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ class WelcomeController < GobiertoPeople::ApplicationController
include DatesRangeHelper

before_action :check_active_submodules
before_action :overrided_root_redirect, only: [:index]

def index
@people = CollectionDecorator.new(
Expand Down
6 changes: 3 additions & 3 deletions app/javascript/lib/i18n/modules/translations.js

Large diffs are not rendered by default.

12 changes: 10 additions & 2 deletions test/integration/gobierto_people/welcome_index_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class WelcomeIndexTest < ActionDispatch::IntegrationTest

def setup
super
@path = gobierto_people_root_path
@path = root_path
end

def site
Expand Down Expand Up @@ -72,9 +72,17 @@ def latest_posts
]
end

def test_welcome_index_redirect
with_current_site(site) do
visit gobierto_people_root_path

assert_redirected_to root_path
end
end

def test_welcome_index
with_current_site(site) do
visit @path
visit root_path

assert has_selector?("p", text: "Home text English")
end
Expand Down