diff --git a/app/views/layouts/base.html.erb b/app/views/layouts/base.html.erb
index d71a5412a96..caff6b633c3 100644
--- a/app/views/layouts/base.html.erb
+++ b/app/views/layouts/base.html.erb
@@ -76,12 +76,6 @@
class: 'site-wrap bg-primary-lighter',
id: local_assigns[:user_main_tag] == false ? nil : 'main-content',
) do %>
- <% if @is_on_home_page && @sign_in_a_b_test_bucket == :banner %>
-
- <%= render 'shared/create_account_banner' %>
-
- <% end %>
-
<%= yield(:pre_flash_content) if content_for?(:pre_flash_content) %>
<%= render FlashComponent.new(flash: flash) %>
diff --git a/app/views/shared/_create_account_banner.html.erb b/app/views/shared/_create_account_banner.html.erb
deleted file mode 100644
index 2badae27fff..00000000000
--- a/app/views/shared/_create_account_banner.html.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-
- <%= t('headings.create_account_with_sp.cta', app_name: APP_NAME) %>
-
-<%= render ButtonComponent.new(
- action: ->(**tag_options, &block) { link_to(sign_up_email_url(source: :sign_in), **tag_options, &block) },
- big: true,
- outline: true,
- full_width: true,
- class: 'margin-bottom-105',
- ).with_content(t('links.create_account')) %>
diff --git a/app/views/sign_up/registrations/new.html.erb b/app/views/sign_up/registrations/new.html.erb
index 50c4a104b94..3c6e816de19 100644
--- a/app/views/sign_up/registrations/new.html.erb
+++ b/app/views/sign_up/registrations/new.html.erb
@@ -2,24 +2,20 @@
<%= render 'shared/sp_alert', section: 'sign_up' %>
-<% if @sign_in_a_b_test_bucket == :tabbed %>
- <% if decorated_session.sp_name %>
- <%= render 'sign_up/registrations/sp_registration_heading' %>
- <% end %>
+<% if decorated_session.sp_name %>
+ <%= render 'sign_up/registrations/sp_registration_heading' %>
+<% end %>
- <%= render TabNavigationComponent.new(
- label: t('account.login.tab_navigation'),
- routes: [
- { text: t('links.next'), path: new_user_session_url },
- { text: t('links.create_account'), path: sign_up_email_path },
- ],
- class: 'margin-bottom-4',
- ) %>
+<%= render TabNavigationComponent.new(
+ label: t('account.login.tab_navigation'),
+ routes: [
+ { text: t('links.next'), path: new_user_session_url },
+ { text: t('links.create_account'), path: sign_up_email_path },
+ ],
+ class: 'margin-bottom-4',
+ ) %>
- <%= render PageHeadingComponent.new.with_content(t('headings.create_account_new_users')) %>
-<% else %>
- <%= render PageHeadingComponent.new.with_content(t('titles.registrations.new')) %>
-<% end %>
+<%= render PageHeadingComponent.new.with_content(t('headings.create_account_new_users')) %>
<%= simple_form_for(
@register_user_email_form,
diff --git a/config/application.yml.default b/config/application.yml.default
index e53c475b156..a9a3f7407a3 100644
--- a/config/application.yml.default
+++ b/config/application.yml.default
@@ -321,7 +321,6 @@ session_total_duration_timeout_in_minutes: 720
ses_configuration_set_name: ''
set_remember_device_session_expiration: false
sign_up_mfa_selection_order_testing: '{ "default": 100, "authentication_app_priority": 0, "usability_priority": 0 }'
-sign_in_a_b_testing: '{ "default": 100,"tabbed" :0, "banner": 0 } '
sp_handoff_bounce_max_seconds: 2
show_user_attribute_deprecation_warnings: false
otp_min_attempts_remaining_warning_count: 3
diff --git a/config/initializers/ab_tests.rb b/config/initializers/ab_tests.rb
index 1c0502f8558..8230fd81f42 100644
--- a/config/initializers/ab_tests.rb
+++ b/config/initializers/ab_tests.rb
@@ -19,11 +19,6 @@ module AbTests
},
)
- SIGN_IN = AbTestBucket.new(
- experiment_name: 'Sign In Experience',
- buckets: IdentityConfig.store.sign_in_a_b_testing,
- )
-
def self.in_person_cta_variant_testing_buckets
buckets = Hash.new
percents = IdentityConfig.store.in_person_cta_variant_testing_percents
diff --git a/config/locales/headings/en.yml b/config/locales/headings/en.yml
index 4de2f26bb75..0a200f65ba2 100644
--- a/config/locales/headings/en.yml
+++ b/config/locales/headings/en.yml
@@ -24,7 +24,6 @@ en:
new: Send another confirmation email
create_account_new_users: Create an account for new users
create_account_with_sp:
- cta: First time using %{app_name}?
sp_text: is using %{app_name} to allow you to sign in to your account safely and
securely.
edit_info:
diff --git a/config/locales/headings/es.yml b/config/locales/headings/es.yml
index e46608025c5..f876a645e9f 100644
--- a/config/locales/headings/es.yml
+++ b/config/locales/headings/es.yml
@@ -24,7 +24,6 @@ es:
new: Enviar otro email de confirmación
create_account_new_users: Crear una cuenta para usuarios nuevos
create_account_with_sp:
- cta: '¿Es la primera vez que utiliza %{app_name}?'
sp_text: está utilizando %{app_name} para permitirle iniciar sesión en su cuenta
de forma segura.
edit_info:
diff --git a/config/locales/headings/fr.yml b/config/locales/headings/fr.yml
index bbb66734b05..8d34aea7712 100644
--- a/config/locales/headings/fr.yml
+++ b/config/locales/headings/fr.yml
@@ -24,7 +24,6 @@ fr:
new: Envoyer un autre courriel de confirmation
create_account_new_users: Créer un compte pour les nouveaux utilisateurs
create_account_with_sp:
- cta: Première fois que vous utilisez %{app_name}?
sp_text: utilise %{app_name} pour vous permettre de vous connecter à votre
compte de façon sûre et sécurisée.
edit_info:
diff --git a/lib/identity_config.rb b/lib/identity_config.rb
index ca7e8011ed9..e57dcaceb97 100644
--- a/lib/identity_config.rb
+++ b/lib/identity_config.rb
@@ -428,7 +428,6 @@ def self.build_store(config_map)
:sign_up_mfa_selection_order_testing, type: :json,
options: { symbolize_names: true }
)
- config.add(:sign_in_a_b_testing, type: :json, options: { symbolize_names: true })
config.add(:skip_encryption_allowed_list, type: :json)
config.add(:sp_handoff_bounce_max_seconds, type: :integer)
config.add(:state_tracking_enabled, type: :boolean)
diff --git a/spec/components/tab_navigation_component_spec.rb b/spec/components/tab_navigation_component_spec.rb
index cfae0201448..d5509904f7e 100644
--- a/spec/components/tab_navigation_component_spec.rb
+++ b/spec/components/tab_navigation_component_spec.rb
@@ -10,16 +10,16 @@
end
it 'renders labelled navigation' do
- expect(rendered).to have_css('nav[aria-label="Navigation"]')
+ expect(rendered).to have_css('.tab-navigation[aria-label="Navigation"]')
expect(rendered).to have_link('First') { |link| !is_current_link?(link) }
expect(rendered).to have_link('Second') { |link| !is_current_link?(link) }
end
context 'with tag options' do
- let(:tag_options) { super().merge(data: { foo: 'bar' }) }
+ let(:tag_options) { super().merge(data: { foo: 'bar' }, class: 'example') }
it 'renders with tag options forwarded to navigation' do
- expect(rendered).to have_css('nav[data-foo="bar"]')
+ expect(rendered).to have_css('.tab-navigation.example[data-foo="bar"]')
end
end
diff --git a/spec/controllers/concerns/sign_in_a_b_test_concern_spec.rb b/spec/controllers/concerns/sign_in_a_b_test_concern_spec.rb
deleted file mode 100644
index 61acd114b21..00000000000
--- a/spec/controllers/concerns/sign_in_a_b_test_concern_spec.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe SignInABTestConcern, type: :controller do
- controller ApplicationController do
- include SignInABTestConcern
- end
-
- describe '#sign_in_a_b_test_bucket' do
- subject(:sign_in_a_b_test_bucket) { controller.sign_in_a_b_test_bucket }
-
- let(:sp_session) { {} }
-
- before do
- allow(session).to receive(:id).and_return('session-id')
- allow(controller).to receive(:sp_session).and_return(sp_session)
- allow(AbTests::SIGN_IN).to receive(:bucket) do |discriminator|
- case discriminator
- when 'session-id'
- :default
- when 'request-id'
- :tabbed
- end
- end
- end
-
- it 'returns the bucket based on session id' do
- expect(sign_in_a_b_test_bucket).to eq(:default)
- end
-
- context 'with associated sp session request id' do
- let(:sp_session) { { request_id: 'request-id' } }
-
- it 'returns the bucket based on request id' do
- expect(sign_in_a_b_test_bucket).to eq(:tabbed)
- end
- end
- end
-end
diff --git a/spec/controllers/sign_up/completions_controller_spec.rb b/spec/controllers/sign_up/completions_controller_spec.rb
index 71a76d439d9..81df8de15c0 100644
--- a/spec/controllers/sign_up/completions_controller_spec.rb
+++ b/spec/controllers/sign_up/completions_controller_spec.rb
@@ -190,7 +190,6 @@
before do
stub_analytics
allow(@analytics).to receive(:track_event)
- allow(controller).to receive(:sign_in_a_b_test_bucket).and_return(:default)
@linker = instance_double(IdentityLinker)
allow(@linker).to receive(:link_identity).and_return(true)
allow(IdentityLinker).to receive(:new).and_return(@linker)
@@ -214,7 +213,6 @@
service_provider_name: subject.decorated_session.sp_name,
page_occurence: 'agency-page',
needs_completion_screen_reason: :new_sp,
- sign_in_a_b_test_bucket: :default,
sp_request_requested_attributes: nil,
sp_session_requested_attributes: nil,
)
@@ -274,7 +272,6 @@
service_provider_name: subject.decorated_session.sp_name,
page_occurence: 'agency-page',
needs_completion_screen_reason: :new_sp,
- sign_in_a_b_test_bucket: :default,
sp_request_requested_attributes: nil,
sp_session_requested_attributes: ['email'],
)
diff --git a/spec/controllers/sign_up/registrations_controller_spec.rb b/spec/controllers/sign_up/registrations_controller_spec.rb
index 8a28af1c2d5..f996336248d 100644
--- a/spec/controllers/sign_up/registrations_controller_spec.rb
+++ b/spec/controllers/sign_up/registrations_controller_spec.rb
@@ -28,13 +28,7 @@
it 'tracks visit event' do
stub_analytics
- allow(controller).to receive(:sign_in_a_b_test_bucket).and_return(:default)
-
- expect(@analytics).to receive(:track_event).with(
- 'User Registration: enter email visited',
- sign_in_a_b_test_bucket: :default,
- from_sign_in: false,
- )
+ expect(@analytics).to receive(:track_event).with('User Registration: enter email visited')
get :new
end
@@ -42,15 +36,10 @@
context 'with source parameter' do
it 'tracks visit event' do
stub_analytics
- allow(controller).to receive(:sign_in_a_b_test_bucket).and_return(:default)
- expect(@analytics).to receive(:track_event).with(
- 'User Registration: enter email visited',
- sign_in_a_b_test_bucket: :default,
- from_sign_in: true,
- )
+ expect(@analytics).to receive(:track_event).with('User Registration: enter email visited')
- get :new, params: { source: :sign_in }
+ get :new
end
end
diff --git a/spec/controllers/users/sessions_controller_spec.rb b/spec/controllers/users/sessions_controller_spec.rb
index f62cc526563..ccf424b5b52 100644
--- a/spec/controllers/users/sessions_controller_spec.rb
+++ b/spec/controllers/users/sessions_controller_spec.rb
@@ -590,14 +590,12 @@
it 'tracks page visit, any alert flashes, and the Devise stored location' do
stub_analytics
allow(controller).to receive(:flash).and_return(alert: 'hello')
- allow(controller).to receive(:sign_in_a_b_test_bucket).and_return(:default)
subject.session['user_return_to'] = mock_valid_site
expect(@analytics).to receive(:track_event).with(
'Sign in page visited',
flash: 'hello',
stored_location: mock_valid_site,
- sign_in_a_b_test_bucket: :default,
)
get :new
diff --git a/spec/support/features/session_helper.rb b/spec/support/features/session_helper.rb
index 501e37c7a6c..e9df38b4ce6 100644
--- a/spec/support/features/session_helper.rb
+++ b/spec/support/features/session_helper.rb
@@ -391,12 +391,12 @@ def sign_up_user_from_sp_without_confirming_email(email)
click_sign_in_from_landing_page_then_click_create_account
- expect(current_url).to eq sign_up_email_url(source: :sign_in)
+ expect(current_url).to eq sign_up_email_url
expect_branded_experience
visit_landing_page_and_click_create_account_with_request_id(sp_request_id)
- expect(current_url).to eq sign_up_email_url(source: :sign_in)
+ expect(current_url).to eq sign_up_email_url
expect_branded_experience
submit_form_with_invalid_email
diff --git a/spec/views/devise/sessions/new.html.erb_spec.rb b/spec/views/devise/sessions/new.html.erb_spec.rb
index d40a514afde..c1d7f8df5e3 100644
--- a/spec/views/devise/sessions/new.html.erb_spec.rb
+++ b/spec/views/devise/sessions/new.html.erb_spec.rb
@@ -1,8 +1,6 @@
require 'rails_helper'
describe 'devise/sessions/new.html.erb' do
- let(:sign_in_a_b_test_bucket) { :default }
-
before do
allow(view).to receive(:resource).and_return(build_stubbed(:user))
allow(view).to receive(:resource_name).and_return(:user)
@@ -11,7 +9,6 @@
allow(view).to receive(:decorated_session).and_return(SessionDecorator.new)
allow_any_instance_of(ActionController::TestRequest).to receive(:path).
and_return('/')
- @sign_in_a_b_test_bucket = sign_in_a_b_test_bucket
assign(:ial, 1)
end
@@ -36,16 +33,19 @@
it 'has a localized page heading' do
render
- expect(rendered).to have_selector('h1', text: t('headings.sign_in_without_sp'))
+ expect(rendered).to have_selector('h1', text: t('headings.sign_in_existing_users'))
end
it 'includes a link to create a new account' do
render
- expect(rendered).
- to have_link(
- t('links.create_account'), href: sign_up_email_url(request_id: nil, source: :sign_in)
- )
+ expect(rendered).to have_link(t('links.create_account'), href: sign_up_email_url)
+ end
+
+ it 'includes a link to create a new account' do
+ render
+
+ expect(rendered).to have_link(t('links.create_account'), href: sign_up_email_url)
end
it 'includes a link to security / privacy page and privacy statement act' do
@@ -173,33 +173,4 @@
expect(rendered).to have_selector('input.email')
end
end
-
- context 'with tabbed layout A/B test' do
- let(:sign_in_a_b_test_bucket) { :tabbed }
-
- it 'has a localized page heading' do
- render
-
- expect(rendered).to have_selector('h1', text: t('headings.sign_in_existing_users'))
- end
-
- it 'includes a link to create a new account' do
- render
-
- expect(rendered).to have_link(
- t('links.create_account'),
- href: sign_up_email_url(request_id: nil, source: :sign_in),
- )
- end
- end
-
- context 'with banner A/B test' do
- let(:sign_in_a_b_test_bucket) { :banner }
-
- it 'has a localized page heading' do
- render
-
- expect(rendered).to have_selector('h1', text: t('headings.sign_in_without_sp'))
- end
- end
end
diff --git a/spec/views/sign_up/registrations/new.html.erb_spec.rb b/spec/views/sign_up/registrations/new.html.erb_spec.rb
index b86a300aebd..ea53d058552 100644
--- a/spec/views/sign_up/registrations/new.html.erb_spec.rb
+++ b/spec/views/sign_up/registrations/new.html.erb_spec.rb
@@ -1,8 +1,6 @@
require 'rails_helper'
describe 'sign_up/registrations/new.html.erb' do
- let(:sign_in_a_b_test_bucket) { :default }
-
let(:sp) do
build_stubbed(
:service_provider,
@@ -17,7 +15,6 @@
analytics: FakeAnalytics.new,
attempts_tracker: IrsAttemptsApiTrackingHelper::FakeAttemptsTracker.new,
)
- @sign_in_a_b_test_bucket = sign_in_a_b_test_bucket
view_context = ActionController::Base.new.view_context
allow(view_context).to receive(:new_user_session_url).
and_return('https://www.example.com/')
@@ -44,7 +41,16 @@
it 'has a localized page heading' do
render
- expect(rendered).to have_selector('h1', text: t('titles.registrations.new'))
+ expect(rendered).to have_selector('h1', text: t('headings.create_account_new_users'))
+ end
+
+ it 'includes a link to sign in' do
+ render
+
+ expect(rendered).to have_link(
+ t('links.next'),
+ href: new_user_session_url(request_id: nil),
+ )
end
it 'sets form autocomplete to off' do
@@ -79,23 +85,4 @@
[target='_blank'][rel='noopener noreferrer']",
)
end
-
- context 'with tabbed layout A/B test' do
- let(:sign_in_a_b_test_bucket) { :tabbed }
-
- it 'has a localized page heading' do
- render
-
- expect(rendered).to have_selector('h1', text: t('headings.create_account_new_users'))
- end
-
- it 'includes a link to sign in' do
- render
-
- expect(rendered).to have_link(
- t('links.next'),
- href: new_user_session_url(request_id: nil),
- )
- end
- end
end