Skip to content

Commit

Permalink
fix(tests): fix test after hard resolving conflicts (#3946)
Browse files Browse the repository at this point in the history
  • Loading branch information
YevheniiaMazur authored and valorkin committed Mar 7, 2018
1 parent 28e9a15 commit 5955ca7
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
4 changes: 0 additions & 4 deletions cypress/integration/buttons_page_spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,6 @@ describe('Buttons page test suite', () => {
.should('to.contain', afterClickVal);
});

it('checkbox example contains checkboxes, that can be checked or unchecked and reactive form', () => {
buttons.clickByText(buttonDemos[2], buttonNames[1]);
buttons.clickByText(buttonDemos[2], buttonNames[2]);

it('checkbox example contains checkboxes, that can be checked or unchecked', () => {
buttons.clickByText(buttonDemos[1], buttonNames[0]);
buttons.clickByText(buttonDemos[1], buttonNames[1]);
Expand Down
11 changes: 11 additions & 0 deletions demo/src/ng-api-doc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2747,6 +2747,11 @@ export const ngdoc: any = {
"type": "boolean",
"description": "<p>if true up/down arrowkeys inside hours and minutes inputs will change time </p>\n"
},
{
"name": "disabled",
"type": "boolean",
"description": "<p>if true hours and minutes fields will be disabled </p>\n"
},
{
"name": "hourStep",
"type": "number",
Expand Down Expand Up @@ -2829,6 +2834,12 @@ export const ngdoc: any = {
"type": "boolean",
"description": "<p>if true up/down arrowkeys inside hours and minutes inputs will change time </p>\n"
},
{
"name": "disabled",
"defaultValue": "false",
"type": "boolean",
"description": "<p>if true hours and minutes fields will be disabled </p>\n"
},
{
"name": "hourStep",
"defaultValue": "1",
Expand Down

0 comments on commit 5955ca7

Please sign in to comment.