diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml index c29b2e60d..1bcdb73bc 100644 --- a/bitbucket-pipelines.yml +++ b/bitbucket-pipelines.yml @@ -1,19 +1,31 @@ image: node:14.15.0 pipelines: - default: - - step: - caches: - - node - script: - - apt-get update; apt-get install -y gettext-base; - - echo 'deb http://dl.google.com/linux/chrome/deb/ stable main' > /etc/apt/sources.list.d/chrome.list - - wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - - - set -x && apt-get update && apt-get install -y xvfb google-chrome-stable - - wget -q -O /usr/bin/xvfb-chrome https://bitbucket.org/atlassian/docker-node-chrome-firefox/raw/ff180e2f16ea8639d4ca4a3abb0017ee23c2836c/scripts/xvfb-chrome - - ln -sf /usr/bin/xvfb-chrome /usr/bin/google-chrome - - chmod 755 /usr/bin/google-chrome - - npm ci - - npm install - - ./node_modules/@angular/cli/bin/ng -v - - npm run test \ No newline at end of file + branches: + '{master,test}': + # - step: + # caches: + # - node + # script: + # - apt-get update; apt-get install -y gettext-base; + # - echo 'deb http://dl.google.com/linux/chrome/deb/ stable main' > /etc/apt/sources.list.d/chrome.list + # - wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - + # - set -x && apt-get update && apt-get install -y xvfb google-chrome-stable + # - wget -q -O /usr/bin/xvfb-chrome https://bitbucket.org/atlassian/docker-node-chrome-firefox/raw/ff180e2f16ea8639d4ca4a3abb0017ee23c2836c/scripts/xvfb-chrome + # - ln -sf /usr/bin/xvfb-chrome /usr/bin/google-chrome + # - chmod 755 /usr/bin/google-chrome + # - npm ci + # - npm install + # - ./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 + \ No newline at end of file diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 236b2863d..d3cfce314 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -46,7 +46,7 @@ import { MatSelectModule } from '@angular/material/select'; import { NgxMatMomentModule } from '@angular-material-components/moment-adapter'; import { MatButtonModule } from '@angular/material/button'; import { ProcessesResolverService } from './resolvers/processes-resolver.service'; - +import { HttpClient } from '@angular/common/http'; @NgModule({ declarations: [AppComponent], @@ -76,12 +76,13 @@ import { ProcessesResolverService } from './resolvers/processes-resolver.service ReactiveFormsModule, MatSelectModule, - MatDialogModule + MatDialogModule, ], providers: [ { provide: MAT_DATE_LOCALE, useValue: 'pt' }, StatusBar, //SplashScreen, + HttpClient, HttpClientModule, { provide: RouteReuseStrategy, useClass: IonicRouteStrategy }, InAppBrowser, diff --git a/src/app/pages/events/attendees/attendees.page.spec.ts b/src/app/pages/events/attendees/attendees.page.spec.ts index d2cb216ae..f8fb83e19 100644 --- a/src/app/pages/events/attendees/attendees.page.spec.ts +++ b/src/app/pages/events/attendees/attendees.page.spec.ts @@ -1,19 +1,19 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { IonicModule } from '@ionic/angular'; -import { AttendeesPage } from './attendees.page'; +import { AttendeesPageModal } from './attendees.page'; describe('AttendeesPage', () => { - let component: AttendeesPage; - let fixture: ComponentFixture; + let component: AttendeesPageModal; + let fixture: ComponentFixture; beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ AttendeesPage ], + declarations: [ AttendeesPageModal ], imports: [IonicModule.forRoot()] }).compileComponents(); - fixture = TestBed.createComponent(AttendeesPage); + fixture = TestBed.createComponent(AttendeesPageModal); component = fixture.componentInstance; fixture.detectChanges(); })); diff --git a/src/app/pages/events/edit-event/edit-event.page.spec.ts b/src/app/pages/events/edit-event/edit-event.page.spec.ts index 4a219c892..f63e92e8d 100644 --- a/src/app/pages/events/edit-event/edit-event.page.spec.ts +++ b/src/app/pages/events/edit-event/edit-event.page.spec.ts @@ -1,3 +1,4 @@ +import { HttpClientModule } from '@angular/common/http'; import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { IonicModule } from '@ionic/angular'; @@ -10,7 +11,10 @@ describe('EditEventPage', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ declarations: [ EditEventPage ], - imports: [IonicModule.forRoot()] + imports: [ + IonicModule.forRoot(), + HttpClientModule + ] }).compileComponents(); fixture = TestBed.createComponent(EditEventPage);