Skip to content

Commit 2dcd018

Browse files
authored
Merge pull request #101 from coreui/dev-vnext
v2.0.0-rc.3
2 parents 409a858 + a1829eb commit 2dcd018

24 files changed

+110
-11970
lines changed

Diff for: .gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
# dependencies
1010
/node_modules
11+
package-lock.json
1112

1213
# IDEs and editors
1314
/.idea

Diff for: CHANGELOG.md

+18
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,23 @@
11
## [angular](./README.md) version `changelog`
22

3+
###### `v2.0.0-rc.3`
4+
- fix(carousels): move to `loremflickr` image placeholders
5+
- refactor: code cleanup
6+
- tests: fix minimal testing
7+
- update: `@angular/*` to `6.1.2`
8+
- update: `@angular/cli` to `6.1.3`
9+
- update: `@angular-devkit/build-angular` to `0.7.3`
10+
- update: `ngx-perfect-scrollbar` to `6.3.0`
11+
- update: `rxjs` to `6.2.2`
12+
- update: `rxjs-compat` to `6.2.2`
13+
- update: `@types/node` to `10.5.8`
14+
- update: `codelyzer` to `4.4.3`
15+
- update: `jasmine-core` to `3.2.0`
16+
- update: `karma` to `3.0.0`
17+
- update: `protractor": "5.4.0`
18+
- update: `ts-node` to `7.0.1`
19+
- update: `tslint` to `5.11.0`
20+
321
###### `v2.0.0-rc.2`
422
- update: @angular/animations to 6.0.9
523
- update: @angular/common to 6.0.9

Diff for: e2e/app.e2e-spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ describe('core-ui App', function() {
77
page = new CoreUIPage();
88
});
99

10-
it('should display message saying app works', () => {
10+
it('should display footer containing creativeLabs', () => {
1111
page.navigateTo();
12-
expect(page.getParagraphText()).toEqual('app works!');
12+
expect(page.getParagraphText()).toContain('creativeLabs');
1313
});
1414
});

Diff for: e2e/app.po.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import { browser, element, by } from 'protractor/globals';
1+
import { browser, element, by } from 'protractor';
22

33
export class CoreUIPage {
44
navigateTo() {
55
return browser.get('/');
66
}
77

88
getParagraphText() {
9-
return element(by.css('app-root h1')).getText();
9+
return element(by.tagName('footer')).getText();
1010
}
1111
}

0 commit comments

Comments
 (0)