Skip to content

Commit

Permalink
Merge pull request #50 from senzingiris/issue49.awinters.1
Browse files Browse the repository at this point in the history
Issue49.awinters.1
  • Loading branch information
docktermj authored Jun 11, 2019
2 parents b022441 + 3e23571 commit 1f82ed9
Show file tree
Hide file tree
Showing 45 changed files with 186 additions and 329 deletions.
14 changes: 14 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
language: node_js
node_js:
- "9"
dist: trusty
sudo: required
branches:
only:
- master
before_script:
- npm install -g @angular/cli
script:
- npm run test:headless
- npm run build:docs
- npm run build
51 changes: 0 additions & 51 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -131,23 +131,6 @@
"browserTarget": "example/search-with-results-and-details:build"
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "examples/search-with-results-and-details/src/test.ts",
"polyfills": "examples/search-with-results-and-details/src/polyfills.ts",
"tsConfig": "examples/search-with-results-and-details/tsconfig.spec.json",
"karmaConfig": "examples/search-with-results-and-details/karma.conf.js",
"styles": [
"examples/search-with-results-and-details/src/styles.scss"
],
"scripts": [],
"assets": [
"examples/search-with-results-and-details/src/favicon.ico",
"examples/search-with-results-and-details/src/assets"
]
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
Expand Down Expand Up @@ -232,23 +215,6 @@
"browserTarget": "example/search-with-spinner:build"
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "examples/search-with-spinner/src/test.ts",
"polyfills": "examples/search-with-spinner/src/polyfills.ts",
"tsConfig": "examples/search-with-spinner/tsconfig.spec.json",
"karmaConfig": "examples/search-with-spinner/karma.conf.js",
"styles": [
"examples/search-with-spinner/src/styles.css"
],
"scripts": [],
"assets": [
"examples/search-with-spinner/src/favicon.ico",
"examples/search-with-spinner/src/assets"
]
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
Expand Down Expand Up @@ -337,23 +303,6 @@
"browserTarget": "example/graph:build"
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "examples/graph/src/test.ts",
"polyfills": "examples/graph/src/polyfills.ts",
"tsConfig": "examples/graph/tsconfig.spec.json",
"karmaConfig": "examples/graph/karma.conf.js",
"styles": [
"examples/graph/src/styles.scss"
],
"scripts": [],
"assets": [
"examples/graph/src/favicon.ico",
"examples/graph/src/assets"
]
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
"publish": "cd ./dist/@senzing/sdk-components-ng/ && npm publish --access restricted",
"watch": "rm -fR dist/@senzing/sdk-components-ng && concurrently --kill-others \"wait-on file:dist/@senzing/sdk-components-ng/public_api.d.ts && ng serve\" \"ng build @senzing/sdk-components-ng --watch\"",
"test": "ng test",
"start:server": "java -jar \"../senzing-api-server/target/senzing-api-server-1.6.0.jar\" -iniFile \"%LOCALAPPDATA%\\Senzing\\Workbench\\project_1\\g2.ini\" -allowedOrigins http://localhost:4300",
"test:headless": "ng test --watch=false --browsers=ChromeHeadless",
"start:server": "java -jar \"../senzing-api-server/target/senzing-api-server-1.6.0.jar\" -iniFile \"%LOCALAPPDATA%\\Senzing\\Workbench\\project_1\\g2.ini\" -allowedOrigins '*'",
"start:rest": "npm run start:server",
"server": "npm run start:server",
"lint": "ng lint",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';

import { SzConfigurationAboutComponent } from './sz-configuration-about.component';
import { SenzingSdkModule } from 'src/lib/sdk.module';

describe('SzConfigurationAboutComponent', () => {
let component: SzConfigurationAboutComponent;
let fixture: ComponentFixture<SzConfigurationAboutComponent>;

beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ SzConfigurationAboutComponent ]
imports: [SenzingSdkModule.forRoot()]
})
.compileComponents();
}));
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';

import { SzConfigurationComponent } from './sz-configuration.component';
import { SenzingSdkModule } from '../../sdk.module';

describe('SzConfigurationComponent', () => {
let component: SzConfigurationComponent;
let fixture: ComponentFixture<SzConfigurationComponent>;

beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ SzConfigurationComponent ]
imports: [SenzingSdkModule.forRoot()]
})
.compileComponents();
}));
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';

import { SzEntityDetailHeaderContentComponent } from './content.component';
import { SenzingSdkModule } from 'src/lib/sdk.module';

describe('SzEntityDetailHeaderContentComponent', () => {
let component: SzEntityDetailHeaderContentComponent;
let fixture: ComponentFixture<SzEntityDetailHeaderContentComponent>;

beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ SzEntityDetailHeaderContentComponent ]
imports: [SenzingSdkModule.forRoot()]
})
.compileComponents();
}));
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';

import { SzEntityDetailHeaderComponent } from './header.component';
import { SenzingSdkModule } from 'src/lib/sdk.module';

describe('SzEntityDetailHeaderComponent', () => {
let component: SzEntityDetailHeaderComponent;
let fixture: ComponentFixture<SzEntityDetailHeaderComponent>;

beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ SzEntityDetailHeaderComponent ]
imports: [SenzingSdkModule.forRoot()]
})
.compileComponents();
}));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import {
*/
@Component({
selector: 'sz-entity-detail-header',
templateUrl: './sz-entity-detail-header.component.html',
styleUrls: ['./sz-entity-detail-header.component.scss']
templateUrl: './header.component.html',
styleUrls: ['./header.component.scss']
})
export class SzEntityDetailHeaderComponent implements OnInit {
@Input() public searchTerm: string;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';

import { SzEntityDetailSectionSummaryComponent } from './summary.component';
import { SenzingSdkModule } from 'src/lib/sdk.module';

describe('SzEntityDetailSectionSummaryComponent', () => {
let component: SzEntityDetailSectionSummaryComponent;
let fixture: ComponentFixture<SzEntityDetailSectionSummaryComponent>;

beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ SzEntityDetailSectionSummaryComponent ]
imports: [SenzingSdkModule.forRoot()]
})
.compileComponents();
}));
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 1f82ed9

Please sign in to comment.