Skip to content

Commit bdcba9d

Browse files
sreichelsreichel
committed
update
1 parent 07cbb8c commit bdcba9d

File tree

2 files changed

+76
-71
lines changed

2 files changed

+76
-71
lines changed

‎cypress/support/commands.js‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,26 @@ Cypress.Commands.add('adminLogInValidUser', () => {
3131
})
3232

3333
Cypress.Commands.add('adminLogInInvalidUser', () => {
34-
cy.get('#username').clear().type(credentials.NoAdmin.login).should('have.value', credentials.NoAdmin.login);
35-
cy.get('#login').clear().type(credentials.NoAdmin.password).should('have.value', credentials.NoAdmin.password);
34+
const username = credentials.NoAdmin.login;
35+
const password = credentials.NoAdmin.password;
36+
37+
cy.log(`Logging in as ${username}`);
38+
cy.get('#username').clear().type(username).should('have.value', username);
39+
cy.get('#login').clear().type(password).should('have.value', password);
3640
cy.get('.form-button').click();
3741
})
3842

3943
Cypress.Commands.add('adminGoToTestRoute', (route) => {
4044
cy.get('body').then($body => {
41-
if ($body.find('#message-popup-window .message-popup-head a').length > 0) {
45+
const popup = '#message-popup-window .message-popup-head a';
46+
if ($body.find(popup).length > 0) {
4247
cy.log('Dismissing popup');
43-
cy.get('#message-popup-window .message-popup-head a').click({force: true});
48+
cy.get(popup).click({force: true});
4449
}
4550
});
4651

4752
cy.log(`Clicking on "${route.h3}" menu`);
48-
cy.get(route.id).click({force: true});
53+
cy.get(route._id).click({force: true});
4954
cy.url().should('include', route.url);
5055
})
5156

@@ -54,17 +59,17 @@ Cypress.Commands.add('adminTestRoute', (route) => {
5459
cy.get(route._h3).should('include.text', route.h3);
5560

5661
cy.log('Checking for active parent class');
57-
cy.get(route.parent).should('have.class', 'active');
62+
cy.get(route._id_parent).should('have.class', 'active');
5863

5964
cy.log('Checking for active class');
60-
cy.get(route.id).should('have.class', 'active');
65+
cy.get(route._id).should('have.class', 'active');
6166
})
6267

6368
Cypress.Commands.add('adminGetConfiguration', (route) => {
6469
cy.get('#nav-admin-system-config').click({force: true});
6570
cy.url().should('include', 'system_config/index');
6671

67-
cy.get(route.id).click({force: true});
72+
cy.get(route._id).click({force: true});
6873
cy.url().should('include', route.url);
6974
cy.get('.content-header h3').should('include.text', route.h3);
7075
})

‎cypress/support/paths.js‎

Lines changed: 63 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -16,245 +16,245 @@ export const paths = {
1616
backend: {
1717
catalog: {
1818
products: {
19-
parent: adminNav.catalog,
20-
id: '#nav-admin-catalog-products',
19+
_id_parent: adminNav.catalog,
20+
_id: '#nav-admin-catalog-products',
2121
url: 'catalog_product/index',
2222
h3: 'Manage Products',
2323
_h3: adminPage._h3,
2424
},
2525
categories: {
26-
parent: adminNav.catalog,
27-
id: '#nav-admin-catalog-categories',
26+
_id_parent: adminNav.catalog,
27+
_id: '#nav-admin-catalog-categories',
2828
url: 'catalog_category/index',
2929
h3: 'New Root Category',
3030
_h3: '#category-edit-container ' + adminPage._h3,
3131
},
3232
search: {
33-
parent: adminNav.catalog,
34-
id: '#nav-admin-catalog-search',
33+
_id_parent: adminNav.catalog,
34+
_id: '#nav-admin-catalog-search',
3535
url: 'catalog_search/index',
3636
h3: 'Search',
3737
_h3: adminPage._h3,
3838
},
3939
sitemap: {
40-
parent: adminNav.catalog,
41-
id: '#nav-admin-catalog-sitemap',
40+
_id_parent: adminNav.catalog,
41+
_id: '#nav-admin-catalog-sitemap',
4242
url: 'sitemap/index',
4343
h3: 'Google Sitemap',
4444
_h3: adminPage._h3,
4545
},
4646
urlrewrite: {
47-
parent: adminNav.catalog,
48-
id: '#nav-admin-catalog-urlrewrite',
47+
_id_parent: adminNav.catalog,
48+
_id: '#nav-admin-catalog-urlrewrite',
4949
url: 'urlrewrite/index',
5050
h3: 'URL Rewrite Management',
5151
_h3: adminPage._h3,
5252
}
5353
},
5454
cms: {
5555
block: {
56-
parent: adminNav.cms,
57-
id: '#nav-admin-cms-block',
56+
_id_parent: adminNav.cms,
57+
_id: '#nav-admin-cms-block',
5858
url: 'cms_block/index',
5959
h3: 'Static Blocks',
6060
_h3: adminPage._h3,
6161
},
6262
page: {
63-
parent: adminNav.cms,
64-
id: '#nav-admin-cms-page',
63+
_id_parent: adminNav.cms,
64+
_id: '#nav-admin-cms-page',
6565
url: 'cms_page/index',
6666
h3: 'Manage Pages',
6767
_h3: adminPage._h3,
6868
},
6969
widget: {
70-
parent: adminNav.cms,
71-
id: '#nav-admin-cms-widget_instance',
70+
_id_parent: adminNav.cms,
71+
_id: '#nav-admin-cms-widget_instance',
7272
url: 'widget_instance/index',
7373
h3: 'Manage Widget Instances',
7474
_h3: adminPage._h3,
7575
}
7676
},
7777
customers: {
7878
manage: {
79-
parent: adminNav.customer,
80-
id: '#nav-admin-customer-manage',
79+
_id_parent: adminNav.customer,
80+
_id: '#nav-admin-customer-manage',
8181
url: 'customer/index',
8282
h3: 'Manage Customers',
8383
_h3: adminPage._h3,
8484
},
8585
groups: {
86-
parent: adminNav.customer,
87-
id: '#nav-admin-customer-group',
86+
_id_parent: adminNav.customer,
87+
_id: '#nav-admin-customer-group',
8888
url: 'customer_group/index',
8989
h3: 'Customer Groups',
9090
_h3: adminPage._h3,
9191
},
9292
online: {
93-
parent: adminNav.customer,
94-
id: '#nav-admin-customer-online',
93+
_id_parent: adminNav.customer,
94+
_id: '#nav-admin-customer-online',
9595
url: 'customer_online/index',
9696
h3: 'Online Customers',
9797
_h3: adminPage._h3,
9898
}
9999
},
100100
newsletter: {
101101
templates: {
102-
parent: adminNav.newsletter,
103-
id: '#nav-admin-newsletter-template',
102+
_id_parent: adminNav.newsletter,
103+
_id: '#nav-admin-newsletter-template',
104104
url: 'newsletter_template/index',
105105
h3: 'Newsletter Templates',
106106
_h3: adminPage._h3,
107107
},
108108
queue: {
109-
parent: adminNav.newsletter,
110-
id: '#nav-admin-newsletter-queue',
109+
_id_parent: adminNav.newsletter,
110+
_id: '#nav-admin-newsletter-queue',
111111
url: 'newsletter_queue/index',
112112
h3: 'Newsletter Queue',
113113
_h3: adminPage._h3,
114114
},
115115
subscriber: {
116-
parent: adminNav.newsletter,
117-
id: '#nav-admin-newsletter-subscriber',
116+
_id_parent: adminNav.newsletter,
117+
_id: '#nav-admin-newsletter-subscriber',
118118
url: 'newsletter_subscriber/index',
119119
h3: 'Newsletter Subscribers',
120120
_h3: adminPage._h3,
121121
},
122122
report: {
123-
parent: adminNav.newsletter,
124-
id: '#nav-admin-newsletter-problem',
123+
_id_parent: adminNav.newsletter,
124+
_id: '#nav-admin-newsletter-problem',
125125
url: 'newsletter_problem/index',
126126
h3: 'Newsletter Problem Reports',
127127
_h3: adminPage._h3,
128128
}
129129
},
130130
promo: {
131131
catalog: {
132-
parent: adminNav.promo,
133-
id: '#nav-admin-promo-catalog',
132+
_id_parent: adminNav.promo,
133+
_id: '#nav-admin-promo-catalog',
134134
url: 'promo_catalog/index',
135135
h3: 'Catalog Price Rules',
136136
_h3: adminPage._h3,
137137
},
138138
cart: {
139-
parent: adminNav.promo,
140-
id: '#nav-admin-promo-quote',
139+
_id_parent: adminNav.promo,
140+
_id: '#nav-admin-promo-quote',
141141
url: 'promo_quote/index',
142142
h3: 'Shopping Cart Price Rules',
143143
_h3: adminPage._h3,
144144
}
145145
},
146146
sales: {
147147
creditmemo: {
148-
parent: adminNav.sales,
149-
id: '#nav-admin-sales-creditmemo',
148+
_id_parent: adminNav.sales,
149+
_id: '#nav-admin-sales-creditmemo',
150150
url: 'sales_creditmemo/index',
151151
h3: 'Credit Memos',
152152
_h3: adminPage._h3,
153153
},
154154
invoice: {
155-
parent: adminNav.sales,
156-
id: '#nav-admin-sales-invoice',
155+
_id_parent: adminNav.sales,
156+
_id: '#nav-admin-sales-invoice',
157157
url: 'sales_invoice/index',
158158
h3: 'Invoice',
159159
_h3: adminPage._h3,
160160
},
161161
order: {
162-
parent: adminNav.sales,
163-
id: '#nav-admin-sales-order',
162+
_id_parent: adminNav.sales,
163+
_id: '#nav-admin-sales-order',
164164
url: 'sales_order/index',
165165
h3: 'Orders',
166166
_h3: adminPage._h3,
167167
},
168168
shipment: {
169-
parent: adminNav.sales,
170-
id: '#nav-admin-sales-shipment',
169+
_id_parent: adminNav.sales,
170+
_id: '#nav-admin-sales-shipment',
171171
url: 'sales_shipment/index',
172172
h3: 'Shipments',
173173
_h3: adminPage._h3,
174174
},
175175
transactions: {
176-
parent: adminNav.sales,
177-
id: '#nav-admin-sales-transactions',
176+
_id_parent: adminNav.sales,
177+
_id: '#nav-admin-sales-transactions',
178178
url: 'sales_transactions/index',
179179
h3: 'Transactions',
180180
_h3: adminPage._h3,
181181
}
182182
},
183183
system: {
184184
cache: {
185-
parent: adminNav.system,
186-
id: '#nav-admin-system-cache',
185+
_id_parent: adminNav.system,
186+
_id: '#nav-admin-system-cache',
187187
url: 'cache/index',
188188
h3: 'Cache Storage Management',
189189
_h3: adminPage._h3,
190190
},
191191
design: {
192-
parent: adminNav.system,
193-
id: '#nav-admin-system-design',
192+
_id_parent: adminNav.system,
193+
_id: '#nav-admin-system-design',
194194
url: 'system_design/index',
195195
h3: 'Design',
196196
_h3: adminPage._h3,
197197
},
198198
email: {
199-
parent: adminNav.system,
200-
id: '#nav-admin-system-email_template',
199+
_id_parent: adminNav.system,
200+
_id: '#nav-admin-system-email_template',
201201
url: 'system_email_template/index',
202202
h3: 'Transactional Emails',
203203
_h3: adminPage._h3,
204204
},
205205
myaccount: {
206-
parent: adminNav.system,
207-
id: '#nav-admin-system-myaccount',
206+
_id_parent: adminNav.system,
207+
_id: '#nav-admin-system-myaccount',
208208
url: 'system_account/index',
209209
h3: 'My Account',
210210
_h3: adminPage._h3,
211211
},
212212
notification: {
213-
parent: adminNav.system,
214-
id: '#nav-admin-system-adminnotification',
213+
_id_parent: adminNav.system,
214+
_id: '#nav-admin-system-adminnotification',
215215
url: 'notification/index',
216216
h3: 'Messages Inbox',
217217
_h3: adminPage._h3,
218218
},
219219
indexes: {
220-
parent: adminNav.system,
221-
id: '#nav-admin-system-index',
220+
_id_parent: adminNav.system,
221+
_id: '#nav-admin-system-index',
222222
url: 'process/list',
223223
h3: 'Index Management',
224224
_h3: adminPage._h3,
225225
},
226226
stores: {
227-
parent: adminNav.system,
228-
id: '#nav-admin-system-store',
227+
_id_parent: adminNav.system,
228+
_id: '#nav-admin-system-store',
229229
url: 'system_store/index',
230230
h3: 'Manage Stores',
231231
_h3: adminPage._h3,
232232
},
233233
variables: {
234-
parent: adminNav.system,
235-
id: '#nav-admin-system-variable',
234+
_id_parent: adminNav.system,
235+
_id: '#nav-admin-system-variable',
236236
url: 'system_variable/index',
237237
h3: 'Custom Variables',
238238
_h3: adminPage._h3,
239239
},
240240
config: {
241241
catalog: {
242242
configswatches: {
243-
id: '#section-configswatches',
243+
_id: '#section-configswatches',
244244
url: 'system_config/edit/section/configswatches',
245245
h3: 'Configurable Swatches',
246246
_h3: adminPage._h3,
247247
},
248248
sitemap: {
249-
id: '#section-sitemap',
249+
_id: '#section-sitemap',
250250
url: 'system_config/edit/section/sitemap',
251251
h3: 'Google Sitemap',
252252
_h3: adminPage._h3,
253253
}
254254
},
255255
customers: {
256256
promo: {
257-
id: '#section-promo',
257+
_id: '#section-promo',
258258
url: 'system_config/edit/section/promo',
259259
h3: 'Promotions',
260260
_h3: adminPage._h3,

0 commit comments

Comments
 (0)