Skip to content
This repository has been archived by the owner on Mar 27, 2023. It is now read-only.

Commit

Permalink
[CHORE] proxy status of test to travis (#2461)
Browse files Browse the repository at this point in the history
also fixed some lint errors showing up right now that snuck into master due to this bug

Signed-off-by: Jeremy Wilken <[email protected]>
  • Loading branch information
gnomeontherun authored Jul 16, 2018
1 parent db68154 commit cb6b019
Show file tree
Hide file tree
Showing 25 changed files with 13 additions and 9 deletions.
Binary file modified gemini/screens/landing-page/default/chrome.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified gemini/screens/landing-page/setting-clicked/chrome.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified gemini/screens/landing-page/setting-hovered/chrome.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified gemini/screens/landing-page/sidenav-hovered/chrome.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified gemini/screens/signposts/bottom-left/chrome.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified gemini/screens/signposts/bottom-middle/chrome.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified gemini/screens/signposts/bottom-right/chrome.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified gemini/screens/signposts/default/chrome.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified gemini/screens/signposts/left-bottom/chrome.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified gemini/screens/signposts/left-middle/chrome.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified gemini/screens/signposts/left-top/chrome.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified gemini/screens/signposts/right-bottom/chrome.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified gemini/screens/signposts/right-middle/chrome.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified gemini/screens/signposts/right-top/chrome.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified gemini/screens/signposts/top-left/chrome.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified gemini/screens/signposts/top-middle/chrome.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified gemini/screens/signposts/top-right/chrome.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified gemini/screens/stack-view/angular-basic/default/chrome.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified gemini/screens/stack-view/angular-lazyload/default/chrome.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified gemini/screens/wizard/basic/default/chrome.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified gemini/screens/wizard/static-wizard-shortcontent/default/chrome.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified gemini/screens/wizard/static-wizard/default/chrome.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 6 additions & 2 deletions scripts/travis.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,11 @@ if (
process.env.TRAVIS_BRANCH === 'master'
) {
shell.exec(`npm install ${AngularPackages.join(' ')} --no-save`);
shell.exec('npm run $TEST_SUITE');
if (shell.exec('npm run $TEST_SUITE').code !== 0) {
shell.exit(1);
}
} else {
shell.exec('npm run $TEST_SUITE');
if (shell.exec('npm run $TEST_SUITE').code !== 0) {
shell.exit(1);
}
}
12 changes: 6 additions & 6 deletions src/clr-angular/button/button-loading/loading-button.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,17 +60,17 @@ describe('Loading Buttons', () => {
fixture.componentInstance.buttonState = ClrLoadingState.LOADING;
fixture.detectChanges();
expect(fixture.componentInstance.buttonState).toEqual(ClrLoadingState.LOADING);
expect(fixture.componentInstance.loadingButtonInstance.el.nativeElement.attributes['disabled']).toBeTruthy();
expect(fixture.componentInstance.loadingButtonInstance.el.nativeElement.attributes.disabled).toBeTruthy();

fixture.componentInstance.buttonState = ClrLoadingState.SUCCESS;
fixture.detectChanges();
expect(fixture.componentInstance.buttonState).toEqual(ClrLoadingState.SUCCESS);
expect(fixture.componentInstance.loadingButtonInstance.el.nativeElement.attributes['disabled']).toBeTruthy();
expect(fixture.componentInstance.loadingButtonInstance.el.nativeElement.attributes.disabled).toBeTruthy();

tick(1000);
fixture.detectChanges();
expect(fixture.componentInstance.buttonState).toEqual(ClrLoadingState.DEFAULT);
expect(fixture.componentInstance.loadingButtonInstance.el.nativeElement.attributes['disabled']).toBeTruthy();
expect(fixture.componentInstance.loadingButtonInstance.el.nativeElement.attributes.disabled).toBeTruthy();

// now the input binding sets the disabled to false
// it should be disabled while loading, and success, but change back to not disabled when it goes back to DEFAULT
Expand All @@ -80,17 +80,17 @@ describe('Loading Buttons', () => {
fixture.componentInstance.buttonState = ClrLoadingState.LOADING;
fixture.detectChanges();
expect(fixture.componentInstance.buttonState).toEqual(ClrLoadingState.LOADING);
expect(fixture.componentInstance.loadingButtonInstance.el.nativeElement.attributes['disabled']).toBeTruthy();
expect(fixture.componentInstance.loadingButtonInstance.el.nativeElement.attributes.disabled).toBeTruthy();

fixture.componentInstance.buttonState = ClrLoadingState.SUCCESS;
fixture.detectChanges();
expect(fixture.componentInstance.buttonState).toEqual(ClrLoadingState.SUCCESS);
expect(fixture.componentInstance.loadingButtonInstance.el.nativeElement.attributes['disabled']).toBeTruthy();
expect(fixture.componentInstance.loadingButtonInstance.el.nativeElement.attributes.disabled).toBeTruthy();

tick(1000);
fixture.detectChanges();
expect(fixture.componentInstance.buttonState).toEqual(ClrLoadingState.DEFAULT);
expect(fixture.componentInstance.loadingButtonInstance.el.nativeElement.attributes['disabled']).toBeFalsy();
expect(fixture.componentInstance.loadingButtonInstance.el.nativeElement.attributes.disabled).toBeFalsy();
})
);

Expand Down
2 changes: 1 addition & 1 deletion src/clr-angular/button/button-loading/loading-button.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export class ClrLoadingButton implements LoadingListener {
constructor(public el: ElementRef, private renderer: Renderer2) {}

loadingStateChange(state: ClrLoadingState): void {
if (state == this.state) {
if (state === this.state) {
return;
}
this.state = state;
Expand Down

0 comments on commit cb6b019

Please sign in to comment.