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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt (-1 / +1 lines)
Lines 112-118 Link Here
112
112
113
<!-- <p><label><input name="rememberme" type="checkbox" id="rememberme" value="forever" tabindex="3" />Remember me</label></p> -->
113
<!-- <p><label><input name="rememberme" type="checkbox" id="rememberme" value="forever" tabindex="3" />Remember me</label></p> -->
114
114
115
<p class="submit"><input id="submit" type="submit" value="Login" tabindex="4" /></p>
115
<p class="submit"><input id="submit-button" type="submit" value="Login" tabindex="4" /></p>
116
</form>
116
</form>
117
[% IF ( casAuthentication ) %]
117
[% IF ( casAuthentication ) %]
118
<h4>Cas login</h4>
118
<h4>Cas login</h4>
(-)a/t/db_dependent/selenium/regressions.t (-4 / +6 lines)
Lines 59-68 subtest 'OPAC - borrowernumber and branchcode as html attributes' => sub { Link Here
59
    $patron->set_password({ password => $password });
59
    $patron->set_password({ password => $password });
60
    $s->opac_auth( $patron->userid, $password );
60
    $s->opac_auth( $patron->userid, $password );
61
    my $elt = $driver->find_element('//span[@class="loggedinusername"]');
61
    my $elt = $driver->find_element('//span[@class="loggedinusername"]');
62
    is( $elt->get_attribute('data-branchcode'), $patron->library->branchcode,
62
    is( $elt->get_attribute('data-branchcode', 1), $patron->library->branchcode,
63
        "Since bug 20921 span.loggedinusername should contain data-branchcode"
63
        "Since bug 20921 span.loggedinusername should contain data-branchcode"
64
        # No idea why we need the second param of get_attribute(). As
65
        # data-branchcode is still there after page finished loading.
64
    );
66
    );
65
    is( $elt->get_attribute('data-borrowernumber'), $patron->borrowernumber,
67
    is( $elt->get_attribute('data-borrowernumber', 1), $patron->borrowernumber,
66
"Since bug 20921 span.loggedinusername should contain data-borrowernumber"
68
"Since bug 20921 span.loggedinusername should contain data-borrowernumber"
67
    );
69
    );
68
    push @cleanup, $patron, $patron->category, $patron->library;
70
    push @cleanup, $patron, $patron->category, $patron->library;
Lines 168-178 subtest 'Display circulation table correctly' => sub { Link Here
168
170
169
    my @thead_th = $driver->find_elements('//table[@id="issues-table"]/thead/tr/th');
171
    my @thead_th = $driver->find_elements('//table[@id="issues-table"]/thead/tr/th');
170
    my $thead_length = 0;
172
    my $thead_length = 0;
171
    $thead_length += $_->get_attribute('colspan') || 0 for @thead_th;
173
    $thead_length += $_->get_attribute('colspan', 1) || 0 for @thead_th;
172
174
173
    my @tfoot_td = $driver->find_elements('//table[@id="issues-table"]/tfoot/tr/td');
175
    my @tfoot_td = $driver->find_elements('//table[@id="issues-table"]/tfoot/tr/td');
174
    my $tfoot_length = 0;
176
    my $tfoot_length = 0;
175
    $tfoot_length += $_->get_attribute('colspan') || 0 for @tfoot_td;
177
    $tfoot_length += $_->get_attribute('colspan', 1) || 0 for @tfoot_td;
176
178
177
    my @tbody_td = $driver->find_elements('//table[@id="issues-table"]/tbody/tr[2]/td');
179
    my @tbody_td = $driver->find_elements('//table[@id="issues-table"]/tbody/tr[2]/td');
178
    my $tbody_length = 0;
180
    my $tbody_length = 0;
(-)a/t/db_dependent/selenium/update_child_to_adult.t (-1 / +2 lines)
Lines 117-122 subtest 'Update child to patron' => sub { Link Here
117
        # Note that if there is only 1 adult in the DB the popup does not appears, but an alert instead. Not tested so far.
117
        # Note that if there is only 1 adult in the DB the popup does not appears, but an alert instead. Not tested so far.
118
        my $handles = $driver->get_window_handles;
118
        my $handles = $driver->get_window_handles;
119
        $driver->switch_to_window($handles->[1]);
119
        $driver->switch_to_window($handles->[1]);
120
        $s->wait_for_element_visible('//table[@id="catst"]'); # category table
120
        $driver->find_element('//input[@id="catcode'.$patron_category_A->categorycode.'"]')->click;
121
        $driver->find_element('//input[@id="catcode'.$patron_category_A->categorycode.'"]')->click;
121
        $s->submit_form;
122
        $s->submit_form;
122
123
Lines 134-140 subtest 'Update child to patron' => sub { Link Here
134
        $driver->find_element('//div[@id="toolbar"]/div[@class="btn-group"][last()]')->click; # More button group
135
        $driver->find_element('//div[@id="toolbar"]/div[@class="btn-group"][last()]')->click; # More button group
135
136
136
        my $update_link = $driver->find_element('//a[@id="updatechild"]');
137
        my $update_link = $driver->find_element('//a[@id="updatechild"]');
137
        is($update_link->get_attribute('data-toggle'), 'tooltip', q|The update link should have a data-toggle attribute => it's a tooltip, not clickable|);
138
        is($update_link->get_attribute('data-toggle', 1), 'tooltip', q|The update link should have a data-toggle attribute => it's a tooltip, not clickable|);
138
        $update_link->click;
139
        $update_link->click;
139
        like( $driver->get_current_url, qr{/members/moremember\.pl\?borrowernumber=$adult_borrowernumber$}, 'After clicking the link, nothing happens, no # in the URL');
140
        like( $driver->get_current_url, qr{/members/moremember\.pl\?borrowernumber=$adult_borrowernumber$}, 'After clicking the link, nothing happens, no # in the URL');
140
    };
141
    };
(-)a/t/lib/Selenium.pm (-3 / +2 lines)
Lines 103-110 sub auth { Link Here
103
103
104
    $self->driver->get($mainpage);
104
    $self->driver->get($mainpage);
105
    $self->fill_form( { userid => $login, password => $password } );
105
    $self->fill_form( { userid => $login, password => $password } );
106
    my $login_button = $self->driver->find_element('//input[@id="submit"]');
106
    my $login_button = $self->driver->find_element('//input[@id="submit-button"]');
107
    $login_button->submit();
107
    $login_button->click();
108
}
108
}
109
109
110
sub opac_auth {
110
sub opac_auth {
111
- 

Return to bug 27055