Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

FIX: Action Module Playground & Components Missing Imports #97

Merged
merged 4 commits into from Jun 4, 2020
Merged

FIX: Action Module Playground & Components Missing Imports #97

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2d965dc
fix (tests): fixed missing imports
mdelez Jun 4, 2020
3c42030
fix (ng-package): added ts-md5 to fix warning
mdelez Jun 4, 2020
91d6b27
refactor (ng-package): small rename
mdelez Jun 4, 2020
aec0cc6
Merge branch 'master' into fix/DSP-333-Tests-ActionPlaygroundComponent
mdelez Jun 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion projects/dsp-ui/ng-package.json
View file
Open in desktop
Expand Up @@ -7,7 +7,8 @@
"@knora/api": "@knora/api",
"ngx-color-picker": "ngxColorPicker",
"jdnconvertiblecalendar": "jdnconvertiblecalendar",
"jdnconvertiblecalendardateadapter": "jdnconvertiblecalendardateadapter"
"jdnconvertiblecalendardateadapter": "jdnconvertiblecalendardateadapter",
"ts-md5": "Md5"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this be "tsMd5" on the right?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Both seem to work but I changed it to "tsMd5" in 91d6b27

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe you can put what you want, I don't know. "tsMd5" is just what the compiler guessed.

}
}
}
12 changes: 8 additions & 4 deletions .../dsp-ui/src/lib/action/components/progress-indicator/progress-indicator.component.spec.ts
View file
Open in desktop
@@ -1,6 +1,7 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';

import { Component, OnInit, ViewChild } from '@angular/core';
import { MatIconModule } from '@angular/material/icon';
import { By } from '@angular/platform-browser';
import { ProgressIndicatorComponent } from './progress-indicator.component';

Expand Down Expand Up @@ -29,9 +30,12 @@ describe('ProgressIndicatorComponent', () => {

beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [
ProgressIndicatorComponent,
TestHostComponent
imports: [
MatIconModule
],
declarations: [
ProgressIndicatorComponent,
TestHostComponent
]
})
.compileComponents();
Expand Down Expand Up @@ -125,7 +129,7 @@ describe('ProgressIndicatorComponent', () => {
const matIconEl = divProgressElement.query(By.css('mat-icon'));

// new status: done
expect(matIconEl.attributes.class).toEqual('after-submit');
expect(matIconEl.attributes.class).toEqual('mat-icon notranslate after-submit material-icons mat-icon-no-color');
expect(matIconEl.nativeElement.innerText).toEqual('done');
expect(matIconEl.styles.color).toEqual('red');
});
Expand Down
3 changes: 2 additions & 1 deletion src/app/action-playground/action-playground.component.spec.ts
View file
Open in desktop
@@ -1,5 +1,6 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';

import { MatListModule } from '@angular/material/list';
import { DspActionModule } from '@dasch-swiss/dsp-ui';
import { ActionPlaygroundComponent } from './action-playground.component';

Expand All @@ -9,7 +10,7 @@ describe('ActionPlaygroundComponent', () => {

beforeEach(async(() => {
TestBed.configureTestingModule({
imports: [ DspActionModule ],
imports: [ DspActionModule, MatListModule ],
declarations: [ ActionPlaygroundComponent ]
})
.compileComponents();
Expand Down