Skip to content

Commit 7a428be

Browse files
Merge branch '5.0/www-mech-update' into 5.0-trunk
2 parents afedcf9 + bd4b612 commit 7a428be

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

t/web/admin_groups.t

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,11 @@ ok( $m->login(), 'logged in' );
119119

120120
$m->get_ok( $url . '/Admin/Groups/index.html' );
121121
ok( $m->form_name( 'GroupsAdmin' ), 'found the filter admin groups form');
122-
$m->select( GroupField => 'Name', GroupOp => 'LIKE' );
122+
$m->select( GroupField => 'Name', 1, GroupOp => 'LIKE' );
123123
$m->field( GroupString => 'Group' );
124-
$m->select( GroupField2 => 'CustomField: '.$cf_1->Name, GroupOp2 => 'LIKE' );
124+
$m->select( GroupField2 => 'CustomField: '.$cf_1->Name, 1, GroupOp2 => 'LIKE' );
125125
$m->field( GroupString2 => 'one' );
126-
$m->select( GroupField3 => 'CustomField: '.$cf_2->Name, GroupOp3 => 'LIKE' );
126+
$m->select( GroupField3 => 'CustomField: '.$cf_2->Name, 1, GroupOp3 => 'LIKE' );
127127
$m->field( GroupString3 => 'two' );
128128
$m->click( 'Go' );
129129

@@ -135,9 +135,9 @@ ok( $m->login(), 'logged in' );
135135

136136
diag 'Test NULL value searches';
137137
ok( $m->form_name( 'GroupsAdmin' ), 'found the filter admin groups form');
138-
$m->select( GroupField => 'Name', GroupOp => 'LIKE' );
138+
$m->select( GroupField => 'Name', 1, GroupOp => 'LIKE' );
139139
$m->field( GroupString => 'Group' );
140-
$m->select( GroupField2 => 'CustomField: '.$cf_2->Name, GroupOp2 => 'is' );
140+
$m->select( GroupField2 => 'CustomField: '.$cf_2->Name, 1, GroupOp2 => 'is' );
141141
$m->field( GroupString2 => 'NULL' );
142142
$m->field( GroupString3 => '' );
143143
$m->click( 'Go' );
@@ -146,7 +146,7 @@ ok( $m->login(), 'logged in' );
146146

147147
ok( $groups[0]->SetDescription('group1') );
148148
$m->form_name( 'GroupsAdmin' );
149-
$m->select( GroupField2 => 'Description', GroupOp2 => 'is' );
149+
$m->select( GroupField2 => 'Description', 1, GroupOp2 => 'is' );
150150
$m->field( GroupString2 => 'NULL' );
151151
$m->click( 'Go' );
152152
$m->text_lacks( $_->Name ) for $groups[0];

t/web/admin_user.t

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,11 @@ $users[2]->AddCustomFieldValue( Field => $cf_3->id, Value => 'three' );
118118

119119
$m->get_ok( $url . '/Admin/Users/index.html' );
120120
ok( $m->form_name( 'UsersAdmin' ), 'found the filter admin users form');
121-
$m->select( UserField => 'Name', UserOp => 'LIKE' );
121+
$m->select( UserField => 'Name', 1, UserOp => 'LIKE' );
122122
$m->field( UserString => 'user' );
123-
$m->select( UserField2 => 'CustomField: '.$cf_1->Name, UserOp2 => 'LIKE' );
123+
$m->select( UserField2 => 'CustomField: '.$cf_1->Name, 1, UserOp2 => 'LIKE' );
124124
$m->field( UserString2 => 'one' );
125-
$m->select( UserField3 => 'CustomField: '.$cf_2->Name, UserOp3 => 'LIKE' );
125+
$m->select( UserField3 => 'CustomField: '.$cf_2->Name, 1, UserOp3 => 'LIKE' );
126126
$m->field( UserString3 => 'two' );
127127
$m->click( 'Go' );
128128

@@ -134,7 +134,7 @@ $m->content_lacks( $users[3]->Name );
134134

135135
diag 'Test NULL value searches';
136136
$m->form_name( 'UsersAdmin' );
137-
$m->select( UserField2 => 'CustomField: '.$cf_2->Name, UserOp2 => 'is' );
137+
$m->select( UserField2 => 'CustomField: '.$cf_2->Name, 1, UserOp2 => 'is' );
138138
$m->field( UserString2 => 'NULL' );
139139
$m->field( UserString3 => '' );
140140
$m->click( 'Go' );
@@ -143,7 +143,7 @@ $m->text_contains( $_->Name ) for @users[0,3];
143143

144144
ok( $users[0]->SetRealName('user1') );
145145
$m->form_name( 'UsersAdmin' );
146-
$m->select( UserField2 => 'Real Name', UserOp2 => 'is' );
146+
$m->select( UserField2 => 'Real Name', 1, UserOp2 => 'is' );
147147
$m->field( UserString2 => 'NULL' );
148148
$m->click( 'Go' );
149149
$m->text_lacks( $_->Name ) for $users[0];

0 commit comments

Comments
 (0)