Skip to content

Commit 16dfebb

Browse files
dkamburovdkamburov
authored
Merge branch 'master' into skrastev/fix-10868-pivot
2 parents 7b2b98c + 2d5d1dc commit 16dfebb

File tree

104 files changed

+13273
-16338
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+13273
-16338
lines changed

‎CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ All notable changes for each version of this project will be documented in this
3636
<igx-column field="Age"></igx-column>
3737
</igx-grid>
3838
```
39+
- Exposed `dataChanging` and `dataChanged` events for the three grids that are re-emits of the corresponding `IgxForOf` events. These indicate the beginning and end of the input change triggering the actual data re-rendering which happens each time the data view changes. This happens after changes in either the data the grid is bound or the state affecting the operations which alter this data (e.g. sorting, filtering, group-by).
3940
- Scrolling with the mouse wheel over cells with templates that include scrollable containers now correctly scroll these inner containers before the grid body scrolls.
4041

4142
## 13.0.5

‎angular.json

Lines changed: 94 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,37 @@
124124
"src/**/*.html"
125125
]
126126
}
127+
},
128+
"cypress-run": {
129+
"builder": "@cypress/schematic:cypress",
130+
"options": {
131+
"devServerTarget": "igniteui-dev-demos:serve"
132+
},
133+
"configurations": {
134+
"production": {
135+
"devServerTarget": "igniteui-dev-demos:serve:production"
136+
}
137+
}
138+
},
139+
"cypress-open": {
140+
"builder": "@cypress/schematic:cypress",
141+
"options": {
142+
"watch": true,
143+
"headless": false
144+
}
145+
},
146+
"e2e": {
147+
"builder": "@cypress/schematic:cypress",
148+
"options": {
149+
"devServerTarget": "igniteui-dev-demos:serve",
150+
"watch": true,
151+
"headless": false
152+
},
153+
"configurations": {
154+
"production": {
155+
"devServerTarget": "igniteui-dev-demos:serve:production"
156+
}
157+
}
127158
}
128159
}
129160
},
@@ -132,10 +163,16 @@
132163
"projectType": "application",
133164
"architect": {
134165
"e2e": {
135-
"builder": "@angular-devkit/build-angular:protractor",
166+
"builder": "@cypress/schematic:cypress",
136167
"options": {
137-
"protractorConfig": "e2e/protractor.conf.js",
138-
"devServerTarget": "igniteui-dev-demos:serve"
168+
"devServerTarget": "igniteui-dev-demos-e2e:serve",
169+
"watch": true,
170+
"headless": false
171+
},
172+
"configurations": {
173+
"production": {
174+
"devServerTarget": "igniteui-dev-demos-e2e:serve:production"
175+
}
139176
}
140177
},
141178
"lint": {
@@ -146,6 +183,26 @@
146183
"e2e/**/*.html"
147184
]
148185
}
186+
},
187+
"cypress-run": {
188+
"builder": "@cypress/schematic:cypress",
189+
"options": {
190+
"devServerTarget": "igniteui-dev-demos-e2e:serve",
191+
"configFile": "e2e//cypress.json"
192+
},
193+
"configurations": {
194+
"production": {
195+
"devServerTarget": "igniteui-dev-demos-e2e:serve:production"
196+
}
197+
}
198+
},
199+
"cypress-open": {
200+
"builder": "@cypress/schematic:cypress",
201+
"options": {
202+
"watch": true,
203+
"headless": false,
204+
"configFile": "e2e//cypress.json"
205+
}
149206
}
150207
}
151208
},
@@ -184,6 +241,39 @@
184241
"projects/igniteui-angular/**/*.html"
185242
]
186243
}
244+
},
245+
"cypress-run": {
246+
"builder": "@cypress/schematic:cypress",
247+
"options": {
248+
"devServerTarget": "igniteui-angular:serve",
249+
"configFile": "projects/igniteui-angular/cypress.json"
250+
},
251+
"configurations": {
252+
"production": {
253+
"devServerTarget": "igniteui-angular:serve:production"
254+
}
255+
}
256+
},
257+
"cypress-open": {
258+
"builder": "@cypress/schematic:cypress",
259+
"options": {
260+
"watch": true,
261+
"headless": false,
262+
"configFile": "projects/igniteui-angular/cypress.json"
263+
}
264+
},
265+
"e2e": {
266+
"builder": "@cypress/schematic:cypress",
267+
"options": {
268+
"devServerTarget": "igniteui-angular:serve",
269+
"watch": true,
270+
"headless": false
271+
},
272+
"configurations": {
273+
"production": {
274+
"devServerTarget": "igniteui-angular:serve:production"
275+
}
276+
}
187277
}
188278
}
189279
}
@@ -192,4 +282,4 @@
192282
"cli": {
193283
"analytics": false
194284
}
195-
}
285+
}

‎cypress.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"integrationFolder": "cypress/integration",
3+
"supportFile": "cypress/support/index.ts",
4+
"videosFolder": "cypress/videos",
5+
"screenshotsFolder": "cypress/screenshots",
6+
"pluginsFile": "cypress/plugins/index.ts",
7+
"fixturesFolder": "cypress/fixtures",
8+
"baseUrl": "http://localhost:4200"
9+
}

‎cypress/integration/spec.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
describe('My First Test', () => {
2+
it('Visits the initial project page', () => {
3+
cy.visit('/')
4+
cy.contains('Welcome')
5+
cy.contains('sandbox app is running!')
6+
})
7+
})

‎cypress/plugins/index.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
// Plugins enable you to tap into, modify, or extend the internal behavior of Cypress
2+
// For more info, visit https://on.cypress.io/plugins-api
3+
module.exports = (on, config) => {}

‎cypress/support/commands.ts

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
// ***********************************************
2+
// This example namespace declaration will help
3+
// with Intellisense and code completion in your
4+
// IDE or Text Editor.
5+
// ***********************************************
6+
// declare namespace Cypress {
7+
// interface Chainable<Subject = any> {
8+
// customCommand(param: any): typeof customCommand;
9+
// }
10+
// }
11+
//
12+
// function customCommand(param: any): void {
13+
// console.warn(param);
14+
// }
15+
//
16+
// NOTE: You can use it like so:
17+
// Cypress.Commands.add('customCommand', customCommand);
18+
//
19+
// ***********************************************
20+
// This example commands.js shows you how to
21+
// create various custom commands and overwrite
22+
// existing commands.
23+
//
24+
// For more comprehensive examples of custom
25+
// commands please read more here:
26+
// https://on.cypress.io/custom-commands
27+
// ***********************************************
28+
//
29+
//
30+
// -- This is a parent command --
31+
// Cypress.Commands.add("login", (email, password) => { ... })
32+
//
33+
//
34+
// -- This is a child command --
35+
// Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... })
36+
//
37+
//
38+
// -- This is a dual command --
39+
// Cypress.Commands.add("dismiss", { prevSubject: 'optional'}, (subject, options) => { ... })
40+
//
41+
//
42+
// -- This will overwrite an existing command --
43+
// Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... })

‎cypress/support/index.ts

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
// ***********************************************************
2+
// This example support/index.js is processed and
3+
// loaded automatically before your test files.
4+
//
5+
// This is a great place to put global configuration and
6+
// behavior that modifies Cypress.
7+
//
8+
// You can change the location of this file or turn off
9+
// automatically serving support files with the
10+
// 'supportFile' configuration option.
11+
//
12+
// You can read more here:
13+
// https://on.cypress.io/configuration
14+
// ***********************************************************
15+
16+
// When a command from ./commands is ready to use, import with `import './commands'` syntax
17+
// import './commands';

‎cypress/tsconfig.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"extends": "../tsconfig.json",
3+
"include": ["**/*.ts"],
4+
"compilerOptions": {
5+
"sourceMap": false,
6+
"types": ["cypress"]
7+
}
8+
}

‎e2e/cypress.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"integrationFolder": "e2e//cypress/integration",
3+
"supportFile": "e2e//cypress/support/index.ts",
4+
"videosFolder": "e2e//cypress/videos",
5+
"screenshotsFolder": "e2e//cypress/screenshots",
6+
"pluginsFile": "e2e//cypress/plugins/index.ts",
7+
"fixturesFolder": "e2e//cypress/fixtures",
8+
"baseUrl": "http://localhost:4200"
9+
}

‎e2e/cypress/integration/spec.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
describe('My First Test', () => {
2+
it('Visits the initial project page', () => {
3+
cy.visit('/')
4+
cy.contains('Welcome')
5+
cy.contains('sandbox app is running!')
6+
})
7+
})

0 commit comments

Comments
 (0)