Skip to content

Commit 8df2044

Browse files
committed
update
1 parent 80e5c7b commit 8df2044

File tree

11 files changed

+384
-104
lines changed

11 files changed

+384
-104
lines changed

app/code/core/Mage/Sitemap/etc/system.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<show_in_website>1</show_in_website>
4949
<show_in_store>1</show_in_store>
5050
<comment>Valid values range: from 0.0 to 1.0.</comment>
51-
<frontend_class>validate-number</frontend_class>
51+
<validate>required-entry validate-number validate-number-range number-range-0-1</validate>
5252
</priority>
5353
<lastmod translate="label">
5454
<label>Show lastmod</label>
@@ -85,7 +85,7 @@
8585
<show_in_website>1</show_in_website>
8686
<show_in_store>1</show_in_store>
8787
<comment>Valid values range: from 0.0 to 1.0.</comment>
88-
<frontend_class>validate-number</frontend_class>
88+
<validate>required-entry validate-number validate-number-range number-range-0-1</validate>
8989
</priority>
9090
<lastmod translate="label">
9191
<label>Show lastmod</label>
@@ -122,7 +122,7 @@
122122
<show_in_website>1</show_in_website>
123123
<show_in_store>1</show_in_store>
124124
<comment>Valid values range: from 0.0 to 1.0.</comment>
125-
<frontend_class>validate-number</frontend_class>
125+
<validate>required-entry validate-number validate-number-range number-range-0-1</validate>
126126
</priority>
127127
<lastmod translate="label">
128128
<label>Show lastmod</label>

app/design/adminhtml/default/default/template/system/config/tabs.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<?php $_iterator = 1; ?>
2929
<?php foreach ($_tab->getSections() as $_section): ?>
3030
<dd>
31-
<a href="<?php echo $_section->getUrl() ?>" class="<?php echo $_section->getClass() ?><?php if($_section->getId()==$this->getActiveSection()): ?> active<?php endif ?> <?php echo $_section->getIsLast()?'last':'' ?>">
31+
<a href="<?php echo $_section->getUrl() ?>" id="section-<?php echo $_section->getId() ?>" class="<?php echo $_section->getClass() ?><?php if($_section->getId()==$this->getActiveSection()): ?> active<?php endif ?> <?php echo $_section->getIsLast()?'last':'' ?>">
3232
<span <?php if($_tab->getId()==$this->getActiveTab()): ?>class="active"<?php endif ?>>
3333
<?php echo $_section->getLabel() ?>
3434
</span>

cypress/e2e/backend/routes.cy.js

Lines changed: 0 additions & 86 deletions
This file was deleted.
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
const navMenuItem = {
2+
cms: '#nav-admin-cms',
3+
}
4+
5+
const routes = {
6+
Page: {
7+
parent: navMenuItem.cms,
8+
id: '#nav-admin-cms-page',
9+
url: '/admin/cms_page/index',
10+
h3: 'Manage Pages',
11+
},
12+
Block: {
13+
parent: navMenuItem.cms,
14+
id: '#nav-admin-cms-block',
15+
url: '/admin/cms_block/index',
16+
h3: 'Static Blocks',
17+
},
18+
WidgetInstance: {
19+
parent: navMenuItem.cms,
20+
id: '#nav-admin-cms-widget_instance',
21+
url: '/admin/widget_instance/index',
22+
h3: 'Manage Widget Instances',
23+
}
24+
};
25+
26+
describe('Checks admin cms routes', () => {
27+
beforeEach('Log in the user', () => {
28+
cy.visit('/admin');
29+
cy.adminLogInValidUser();
30+
});
31+
32+
Object.keys(routes).forEach(routeKey => {
33+
const route = routes[routeKey];
34+
it(`tests ${routeKey}`, () => {
35+
cy.adminTestRoute(route);
36+
});
37+
});
38+
});
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
const navMenuItem = {
2+
customer: '#nav-admin-customer',
3+
}
4+
5+
const routes = {
6+
//customer
7+
Manage: {
8+
parent: navMenuItem.customer,
9+
id: '#nav-admin-customer-manage',
10+
url: '/admin/customer/index',
11+
h3: 'Manage Customers',
12+
},
13+
Groups: {
14+
parent: navMenuItem.customer,
15+
id: '#nav-admin-customer-group',
16+
url: '/admin/customer_group/index',
17+
h3: 'Customer Groups',
18+
},
19+
Online: {
20+
parent: navMenuItem.customer,
21+
id: '#nav-admin-customer-online',
22+
url: '/admin/customer_online/index',
23+
h3: 'Online Customers',
24+
}
25+
};
26+
27+
describe('Checks admin customer routes', () => {
28+
beforeEach('Log in the user', () => {
29+
cy.visit('/admin');
30+
cy.adminLogInValidUser();
31+
});
32+
33+
Object.keys(routes).forEach(routeKey => {
34+
const route = routes[routeKey];
35+
it(`tests ${routeKey}`, () => {
36+
cy.adminTestRoute(route);
37+
});
38+
});
39+
});
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
const navMenuItem = {
2+
newsletter: '#nav-admin-newsletter',
3+
}
4+
5+
const routes = {
6+
Templates: {
7+
parent: navMenuItem.newsletter,
8+
id: '#nav-admin-newsletter-template',
9+
url: '/admin/newsletter_template/index',
10+
h3: 'Newsletter Templates',
11+
},
12+
Queue: {
13+
parent: navMenuItem.newsletter,
14+
id: '#nav-admin-newsletter-queue',
15+
url: '/admin/newsletter_queue/index',
16+
h3: 'Newsletter Queue',
17+
},
18+
Subscriber: {
19+
parent: navMenuItem.newsletter,
20+
id: '#nav-admin-newsletter-subscriber',
21+
url: '/admin/newsletter_subscriber/index',
22+
h3: 'Newsletter Subscribers',
23+
},
24+
Report: {
25+
parent: navMenuItem.newsletter,
26+
id: '#nav-admin-newsletter-problem',
27+
url: '/admin/newsletter_problem/index',
28+
h3: 'Newsletter Problem Reports',
29+
}
30+
};
31+
32+
describe('Checks admin newsletter routes', () => {
33+
beforeEach('Log in the user', () => {
34+
cy.visit('/admin');
35+
cy.adminLogInValidUser();
36+
});
37+
38+
Object.keys(routes).forEach(routeKey => {
39+
const route = routes[routeKey];
40+
it(`tests ${routeKey}`, () => {
41+
cy.adminTestRoute(route);
42+
});
43+
});
44+
});
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
const navMenuItem = {
2+
promo: '#nav-admin-promo',
3+
}
4+
5+
const routes = {
6+
//promo
7+
CatalogRules: {
8+
parent: navMenuItem.promo,
9+
id: '#nav-admin-promo-catalog',
10+
url: '/admin/promo_catalog/index',
11+
h3: 'Catalog Price Rules',
12+
},
13+
CartRules: {
14+
parent: navMenuItem.promo,
15+
id: '#nav-admin-promo-quote',
16+
url: '/admin/promo_quote/index',
17+
h3: 'Shopping Cart Price Rules',
18+
}
19+
};
20+
21+
describe('Checks admin promo routes', () => {
22+
beforeEach('Log in the user', () => {
23+
cy.visit('/admin');
24+
cy.adminLogInValidUser();
25+
});
26+
27+
Object.keys(routes).forEach(routeKey => {
28+
const route = routes[routeKey];
29+
it(`tests ${routeKey}`, () => {
30+
cy.adminTestRoute(route);
31+
});
32+
});
33+
});
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
const navMenuItem = {
2+
sales: '#nav-admin-sales',
3+
}
4+
5+
const routes = {
6+
Creditmemo: {
7+
parent: navMenuItem.sales,
8+
id: '#nav-admin-sales-creditmemo',
9+
url: '/admin/sales_creditmemo/index',
10+
h3: 'Credit Memos',
11+
},
12+
Invoice: {
13+
parent: navMenuItem.sales,
14+
id: '#nav-admin-sales-invoice',
15+
url: '/admin/sales_invoice/index',
16+
h3: 'Invoice',
17+
},
18+
Order: {
19+
parent: navMenuItem.sales,
20+
id: '#nav-admin-sales-order',
21+
url: '/admin/sales_order/index',
22+
h3: 'Orders',
23+
},
24+
Shipment: {
25+
parent: navMenuItem.sales,
26+
id: '#nav-admin-sales-shipment',
27+
url: '/admin/sales_shipment/index',
28+
h3: 'Shipments',
29+
},
30+
Transactions: {
31+
parent: navMenuItem.sales,
32+
id: '#nav-admin-sales-transactions',
33+
url: '/admin/sales_transactions/index',
34+
h3: 'Transactions',
35+
}
36+
};
37+
38+
describe('Checks admin sales routes', () => {
39+
beforeEach('Log in the user', () => {
40+
cy.visit('/admin');
41+
cy.adminLogInValidUser();
42+
});
43+
44+
Object.keys(routes).forEach(routeKey => {
45+
const route = routes[routeKey];
46+
it(`tests ${routeKey}`, () => {
47+
cy.adminTestRoute(route);
48+
});
49+
});
50+
});

0 commit comments

Comments
 (0)