Skip to content

Commit 2acf7ae

Browse files
committed
Address rspec failures
1 parent c6fc546 commit 2acf7ae

File tree

5 files changed

+27
-6
lines changed

5 files changed

+27
-6
lines changed

spec/features/notifications/unread_badge_spec.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
before do
1010
configure_host_platform
11+
logout(:user)
1112
login_as_platform_manager
1213
end
1314

spec/requests/better_together/communities_controller_spec.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77

88
before do
99
configure_host_platform
10-
login('[email protected]', 'password12345')
10+
logout(:user)
11+
login_as_platform_manager
1112
end
1213

1314
describe 'GET /:locale/.../host/communities' do

spec/requests/better_together/events_controller_spec.rb

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
before do
1111
configure_host_platform
12+
logout(:user)
1213
end
1314

1415
describe 'GET /events/:id.ics' do
@@ -75,7 +76,10 @@
7576
end
7677

7778
context 'when logged in' do
78-
before { login(user_email, password) }
79+
before do
80+
logout(:user)
81+
login(user_email, password)
82+
end
7983

8084
it 'creates RSVP as interested' do
8185
post better_together.rsvp_interested_event_path(event, locale:)

spec/requests/better_together/navigation_areas_controller_spec.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77

88
before do
99
configure_host_platform
10-
login('[email protected]', 'password12345')
10+
logout(:user)
11+
login_as_platform_manager
1112
end
1213

1314
describe 'GET /:locale/.../navigation_areas' do

spec/support/request_spec_helper.rb

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,23 @@ def json
1414
end
1515

1616
def login(email, password)
17-
post better_together.user_session_path(locale: I18n.locale || I18n.default_locale), params: {
18-
user: { email: email, password: password }
19-
}
17+
# Clear any existing session state to prevent interference between tests
18+
reset_session if respond_to?(:reset_session)
19+
20+
# Ensure we have a valid locale for the route
21+
locale = (I18n.locale || I18n.default_locale).to_s
22+
23+
begin
24+
post better_together.user_session_path(locale: locale), params: {
25+
user: { email: email, password: password }
26+
}
27+
rescue ActionController::RoutingError => e
28+
# Fallback: try with explicit engine route if the helper fails
29+
Rails.logger.warn "Route helper failed: #{e.message}. Using fallback route."
30+
post "/#{locale}/users/sign-in", params: {
31+
user: { email: email, password: password }
32+
}
33+
end
2034
end
2135

2236
def configure_host_platform

0 commit comments

Comments
 (0)