This commit is contained in:
Peter Maquiran
2021-07-08 11:07:40 +01:00
parent a61f953cdc
commit f27d0f30ae
4 changed files with 41 additions and 24 deletions
+28 -16
View File
@@ -1,19 +1,31 @@
image: node:14.15.0 image: node:14.15.0
pipelines: pipelines:
default: branches:
- step: '{master,test}':
caches: # - step:
- node # caches:
script: # - node
- apt-get update; apt-get install -y gettext-base; # script:
- echo 'deb http://dl.google.com/linux/chrome/deb/ stable main' > /etc/apt/sources.list.d/chrome.list # - apt-get update; apt-get install -y gettext-base;
- wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - # - echo 'deb http://dl.google.com/linux/chrome/deb/ stable main' > /etc/apt/sources.list.d/chrome.list
- set -x && apt-get update && apt-get install -y xvfb google-chrome-stable # - wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -
- wget -q -O /usr/bin/xvfb-chrome https://bitbucket.org/atlassian/docker-node-chrome-firefox/raw/ff180e2f16ea8639d4ca4a3abb0017ee23c2836c/scripts/xvfb-chrome # - set -x && apt-get update && apt-get install -y xvfb google-chrome-stable
- ln -sf /usr/bin/xvfb-chrome /usr/bin/google-chrome # - wget -q -O /usr/bin/xvfb-chrome https://bitbucket.org/atlassian/docker-node-chrome-firefox/raw/ff180e2f16ea8639d4ca4a3abb0017ee23c2836c/scripts/xvfb-chrome
- chmod 755 /usr/bin/google-chrome # - ln -sf /usr/bin/xvfb-chrome /usr/bin/google-chrome
- npm ci # - chmod 755 /usr/bin/google-chrome
- npm install # - npm ci
- ./node_modules/@angular/cli/bin/ng -v # - npm install
- npm run test # - ./node_modules/@angular/cli/bin/ng -v
# - npm run test
- step:
caches:
- node
script:
- apt-get update;
- npm ci
- npm install
- ./node_modules/@angular/cli/bin/ng -v
- npm run build --prod
+3 -2
View File
@@ -46,7 +46,7 @@ import { MatSelectModule } from '@angular/material/select';
import { NgxMatMomentModule } from '@angular-material-components/moment-adapter'; import { NgxMatMomentModule } from '@angular-material-components/moment-adapter';
import { MatButtonModule } from '@angular/material/button'; import { MatButtonModule } from '@angular/material/button';
import { ProcessesResolverService } from './resolvers/processes-resolver.service'; import { ProcessesResolverService } from './resolvers/processes-resolver.service';
import { HttpClient } from '@angular/common/http';
@NgModule({ @NgModule({
declarations: [AppComponent], declarations: [AppComponent],
@@ -76,12 +76,13 @@ import { ProcessesResolverService } from './resolvers/processes-resolver.service
ReactiveFormsModule, ReactiveFormsModule,
MatSelectModule, MatSelectModule,
MatDialogModule MatDialogModule,
], ],
providers: [ providers: [
{ provide: MAT_DATE_LOCALE, useValue: 'pt' }, { provide: MAT_DATE_LOCALE, useValue: 'pt' },
StatusBar, StatusBar,
//SplashScreen, //SplashScreen,
HttpClient,
HttpClientModule, HttpClientModule,
{ provide: RouteReuseStrategy, useClass: IonicRouteStrategy }, { provide: RouteReuseStrategy, useClass: IonicRouteStrategy },
InAppBrowser, InAppBrowser,
@@ -1,19 +1,19 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { IonicModule } from '@ionic/angular'; import { IonicModule } from '@ionic/angular';
import { AttendeesPage } from './attendees.page'; import { AttendeesPageModal } from './attendees.page';
describe('AttendeesPage', () => { describe('AttendeesPage', () => {
let component: AttendeesPage; let component: AttendeesPageModal;
let fixture: ComponentFixture<AttendeesPage>; let fixture: ComponentFixture<AttendeesPageModal>;
beforeEach(async(() => { beforeEach(async(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
declarations: [ AttendeesPage ], declarations: [ AttendeesPageModal ],
imports: [IonicModule.forRoot()] imports: [IonicModule.forRoot()]
}).compileComponents(); }).compileComponents();
fixture = TestBed.createComponent(AttendeesPage); fixture = TestBed.createComponent(AttendeesPageModal);
component = fixture.componentInstance; component = fixture.componentInstance;
fixture.detectChanges(); fixture.detectChanges();
})); }));
@@ -1,3 +1,4 @@
import { HttpClientModule } from '@angular/common/http';
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { IonicModule } from '@ionic/angular'; import { IonicModule } from '@ionic/angular';
@@ -10,7 +11,10 @@ describe('EditEventPage', () => {
beforeEach(waitForAsync(() => { beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
declarations: [ EditEventPage ], declarations: [ EditEventPage ],
imports: [IonicModule.forRoot()] imports: [
IonicModule.forRoot(),
HttpClientModule
]
}).compileComponents(); }).compileComponents();
fixture = TestBed.createComponent(EditEventPage); fixture = TestBed.createComponent(EditEventPage);