TT#56376 selenium: create/delete rw_ruleset cleanups

Common.pm:
- Add return unless to create/delete rw_ruleset
- Swapped arguments on create_rw_ruleset

controller_rw_ruleset:
- Swapped arguments here too

Change-Id: Ib4343ad1b06c7a249bea6c874c0190dd352cba8b
changes/44/29644/2
Nico Schedel 7 years ago
parent 89e184e044
commit 63414a1a32

@ -169,7 +169,8 @@ sub delete_reseller_contract {
}
sub create_rw_ruleset {
my($self, $resellername, $rulesetname) = @_;
my($self, $rulesetname, $resellername) = @_;
return unless $rulesetname, $resellername;
diag('Go to Rewrite Rule Sets page');
$self->driver->find_element('//*[@id="main-nav"]//*[contains(text(),"Settings")]')->click();
@ -189,6 +190,7 @@ sub create_rw_ruleset {
sub delete_rw_ruleset {
my($self, $rulesetname) = @_;
return unless $rulesetname;
diag('Go to Rewrite Rule Sets page');
$self->driver->find_element('//*[@id="main-nav"]//*[contains(text(),"Settings")]')->click();

@ -27,7 +27,7 @@ my $domainstring = ("domain" . int(rand(100000)) . ".example.org");
$c->login_ok();
$c->create_reseller_contract($contractid);
$c->create_reseller($resellername, $contractid);
$c->create_rw_ruleset($resellername, $rulesetname);
$c->create_rw_ruleset($rulesetname, $resellername);
diag('Search for our new Rewrite Rule Set');
$d->fill_element('//*[@id="rewrite_rule_set_table_filter"]/label/input', 'xpath', 'thisshouldnotexist');

Loading…
Cancel
Save