Attachment #170768 for bug #35402

View | Details | Raw Unified | Return to bug 35402
Collapse All | Expand All

Lines 82-88 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt (-1 / +1 lines)
82	[% END %]	82	[% END %]
83	[% END %]	83	[% END %]
84	<li><hr class="dropdown-divider"></li>	84	<li><hr class="dropdown-divider"></li>
85	<li><a href="#" class="dropdown-item patron-list-add" data-listid="new">New list</a></li>	85	<li><a href="#" class="patron-list-add dropdown-item" data-listid="new">New list</a></li>
86	</ul>	86	</ul>
87	</div>	87	</div>
88	[% END %]	88	[% END %]

Lines 206-212 SKIP: { Link Here

(-)a/t/db_dependent/selenium/administration_tasks.t (-1 / +1 lines)
206	$s->submit_form;	206	$s->submit_form;
207		207
208	# Make sure the category is updated	208	# Make sure the category is updated
209	$s->driver->find_element('//div[@class="alert alert-info"]');	209	$s->driver->find_element('//div[@class="dialog message"]');
210		210
211	# Select "Show all" in the datatable "Show x entries" dropdown list to make sure our category is not hidden	211	# Select "Show all" in the datatable "Show x entries" dropdown list to make sure our category is not hidden
212	$s->show_all_entries('//div[@id="patron_categories_wrapper"]');	212	$s->show_all_entries('//div[@id="patron_categories_wrapper"]');




        like( $driver->get_title, qr(Two-factor authentication), 'Must be on the page with the pref on' );

        is(
            $driver->find_element( '//div[@id="registration-status-disabled"]/div[@class="alert alert-info two-factor-status"]' )->get_text,
            'Status: Disabled',
            '2FA is disabled'
        );

        is(
            $driver->find_element( '//div[@id="registration-status-enabled"]/div[@class="alert alert-info two-factor-status"]' )->get_text,
            '', # 'Status: Enabled' is not shown
            '2FA is disabled'
        );

        $s->wait_for_ajax;
        $driver->get($s->base_url . q|members/two_factor_auth.pl|);
        is(
            $driver->find_element( '//div[@id="registration-status-disabled"]/div[@class="alert alert-info two-factor-status"]' )->get_text,
            '', # 'Status: Disabled' is not shown
            '2FA is enabled'
        );

        is(
            $driver->find_element( '//div[@id="registration-status-enabled"]/div[@class="alert alert-info two-factor-status"]' )->get_text,
            'Status: Enabled',
            '2FA is enabled'
        );

        $driver->get( $s->base_url . q|members/two_factor_auth.pl| );

        is(
            $driver->find_element( '//div[@id="registration-status-disabled"]/div[@class="alert alert-info two-factor-status"]' )->get_text,
            '', # 'Status: Disabled' is not shown
            '2FA is enabled'
        );

        is(
            $driver->find_element( '//div[@id="registration-status-enabled"]/div[@class="alert alert-info two-factor-status"]' )->get_text,
            'Status: Enabled',
            '2FA is enabled'
        );

        $driver->find_element('//form[@id="two-factor-auth"]//input[@type="submit"]')->click;

        is(
            $driver->find_element( '//div[@id="registration-status-disabled"]/div[@class="alert alert-info two-factor-status"]' )->get_text,
            'Status: Disabled',
            '2FA is disabled'
        );

        is(
            $driver->find_element( '//div[@id="registration-status-enabled"]/div[@class="alert alert-info two-factor-status"]' )->get_text,
            '', # 'Status: Enabled' is not shown
            '2FA is disabled'
        );

Lines 394-400 subtest 'Search patrons' => sub { Link Here

(-)a/t/db_dependent/selenium/patrons_search.t (-2 / +1 lines)
394	is( $patron_selected_text, "Patrons selected: 3", "Three patrons still selected" );	394	is( $patron_selected_text, "Patrons selected: 3", "Three patrons still selected" );
395		395
396	$driver->find_element('//*[@id="patronlist-menu"]')->click;	396	$driver->find_element('//*[@id="patronlist-menu"]')->click;
397	$driver->find_element('//a[@class="patron-list-add"]')->click;	397	$driver->find_element('//a[@class="patron-list-add dropdown-item"]')->click;
398	my $patron_list_name = "my new list";	398	my $patron_list_name = "my new list";
399	$driver->find_element('//input[@id="new_patron_list"]')->send_keys($patron_list_name);	399	$driver->find_element('//input[@id="new_patron_list"]')->send_keys($patron_list_name);
400	$driver->find_element('//button[@id="add_to_patron_list_submit"]')->click;	400	$driver->find_element('//button[@id="add_to_patron_list_submit"]')->click;
401	-

Return to bug 35402

Lines 68-80 SKIP: { Link Here

(-)a/t/db_dependent/selenium/authentication_2fa.t (-8 / +8 lines)
68	like( $driver->get_title, qr(Two-factor authentication), 'Must be on the page with the pref on' );	68	like( $driver->get_title, qr(Two-factor authentication), 'Must be on the page with the pref on' );
69		69
70	is(	70	is(
71	$driver->find_element( '//div[@id="registration-status-disabled"]/div[@class="two-factor-status"]' )->get_text,	71	$driver->find_element( '//div[@id="registration-status-disabled"]/div[@class="alert alert-info two-factor-status"]' )->get_text,
72	'Status: Disabled',	72	'Status: Disabled',
73	'2FA is disabled'	73	'2FA is disabled'
74	);	74	);
75		75
76	is(	76	is(
77	$driver->find_element( '//div[@id="registration-status-enabled"]/div[@class="two-factor-status"]' )->get_text,	77	$driver->find_element( '//div[@id="registration-status-enabled"]/div[@class="alert alert-info two-factor-status"]' )->get_text,
78	'', # 'Status: Enabled' is not shown	78	'', # 'Status: Enabled' is not shown
79	'2FA is disabled'	79	'2FA is disabled'
80	);	80	);
Lines 100-112 SKIP: { Link Here
100	$s->wait_for_ajax;	100	$s->wait_for_ajax;
101	$driver->get($s->base_url . q\|members/two_factor_auth.pl\|);	101	$driver->get($s->base_url . q\|members/two_factor_auth.pl\|);
102	is(	102	is(
103	$driver->find_element( '//div[@id="registration-status-disabled"]/div[@class="two-factor-status"]' )->get_text,	103	$driver->find_element( '//div[@id="registration-status-disabled"]/div[@class="alert alert-info two-factor-status"]' )->get_text,
104	'', # 'Status: Disabled' is not shown	104	'', # 'Status: Disabled' is not shown
105	'2FA is enabled'	105	'2FA is enabled'
106	);	106	);
107		107
108	is(	108	is(
109	$driver->find_element( '//div[@id="registration-status-enabled"]/div[@class="two-factor-status"]' )->get_text,	109	$driver->find_element( '//div[@id="registration-status-enabled"]/div[@class="alert alert-info two-factor-status"]' )->get_text,
110	'Status: Enabled',	110	'Status: Enabled',
111	'2FA is enabled'	111	'2FA is enabled'
112	);	112	);
Lines 311-323 SKIP: { Link Here
311	$driver->get( $s->base_url . q\|members/two_factor_auth.pl\| );	311	$driver->get( $s->base_url . q\|members/two_factor_auth.pl\| );
312		312
313	is(	313	is(
314	$driver->find_element( '//div[@id="registration-status-disabled"]/div[@class="two-factor-status"]' )->get_text,	314	$driver->find_element( '//div[@id="registration-status-disabled"]/div[@class="alert alert-info two-factor-status"]' )->get_text,
315	'', # 'Status: Disabled' is not shown	315	'', # 'Status: Disabled' is not shown
316	'2FA is enabled'	316	'2FA is enabled'
317	);	317	);
318		318
319	is(	319	is(
320	$driver->find_element( '//div[@id="registration-status-enabled"]/div[@class="two-factor-status"]' )->get_text,	320	$driver->find_element( '//div[@id="registration-status-enabled"]/div[@class="alert alert-info two-factor-status"]' )->get_text,
321	'Status: Enabled',	321	'Status: Enabled',
322	'2FA is enabled'	322	'2FA is enabled'
323	);	323	);
Lines 325-337 SKIP: { Link Here
325	$driver->find_element('//form[@id="two-factor-auth"]//input[@type="submit"]')->click;	325	$driver->find_element('//form[@id="two-factor-auth"]//input[@type="submit"]')->click;
326		326
327	is(	327	is(
328	$driver->find_element( '//div[@id="registration-status-disabled"]/div[@class="two-factor-status"]' )->get_text,	328	$driver->find_element( '//div[@id="registration-status-disabled"]/div[@class="alert alert-info two-factor-status"]' )->get_text,
329	'Status: Disabled',	329	'Status: Disabled',
330	'2FA is disabled'	330	'2FA is disabled'
331	);	331	);
332		332
333	is(	333	is(
334	$driver->find_element( '//div[@id="registration-status-enabled"]/div[@class="two-factor-status"]' )->get_text,	334	$driver->find_element( '//div[@id="registration-status-enabled"]/div[@class="alert alert-info two-factor-status"]' )->get_text,
335	'', # 'Status: Enabled' is not shown	335	'', # 'Status: Enabled' is not shown
336	'2FA is disabled'	336	'2FA is disabled'
337	);	337	);