Skip to content

Commit

Permalink
DON-950: Remove all usages of old MatomoModule from spec files
Browse files Browse the repository at this point in the history
  • Loading branch information
bdsl committed Mar 26, 2024
1 parent c0ab84f commit 2e146f6
Show file tree
Hide file tree
Showing 15 changed files with 3 additions and 92 deletions.
8 changes: 0 additions & 8 deletions src/app/app.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import { MatSelectModule } from '@angular/material/select';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { RouterTestingModule } from '@angular/router/testing';
import { RecaptchaModule } from 'ng-recaptcha';
import { MatomoModule } from 'ngx-matomo';
import { InMemoryStorageService } from 'ngx-webstorage-service';

import { AppComponent } from './app.component';
Expand All @@ -29,13 +28,6 @@ describe('AppComponent', () => {
MatIconModule,
MatInputModule,
MatListModule,
MatomoModule.forRoot({
scriptUrl: `https://example.com/matomo.js`,
trackers: [],
routeTracking: {
enable: true,
}
}),
NgxMatomoModule.forRoot({
siteId: '',
trackerUrl: '',
Expand Down
1 change: 0 additions & 1 deletion src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import {RouterModule, RouterOutlet} from '@angular/router';
import {ComponentsModule} from '@biggive/components-angular';
import {TransferHttpCacheModule} from '@nguniversal/common';
import {RECAPTCHA_BASE_URL, RECAPTCHA_NONCE} from 'ng-recaptcha';
import {MatomoModule} from 'ngx-matomo';
import {LOCAL_STORAGE} from 'ngx-webstorage-service';

import {AppComponent} from './app.component';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import {Component} from "@angular/core";
import {ComponentFixture, TestBed} from '@angular/core/testing';
import { MatDialogModule } from '@angular/material/dialog';
import {ActivatedRoute} from "@angular/router";
import { MatomoModule } from 'ngx-matomo';
import {InMemoryStorageService} from "ngx-webstorage-service";
import {of} from "rxjs";

Expand Down Expand Up @@ -39,13 +38,6 @@ describe('DonationStartContainer', () => {
imports: [
HttpClientTestingModule,
MatDialogModule,
MatomoModule.forRoot({
scriptUrl: `https://example.com/matomo.js`,
trackers: [],
routeTracking: {
enable: true,
}
}),
NgxMatomoModule.forRoot({
siteId: '',
trackerUrl: '',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import {NoopAnimationsModule} from '@angular/platform-browser/animations';
import {ActivatedRoute, Router} from '@angular/router';
import {RouterTestingModule} from '@angular/router/testing';
import {RecaptchaModule} from 'ng-recaptcha';
import {MatomoModule} from 'ngx-matomo';
import {MatomoTracker as MatomoClientTracker, NgxMatomoModule} from 'ngx-matomo-client';
import {InMemoryStorageService} from 'ngx-webstorage-service';
import {of} from 'rxjs';
Expand Down Expand Up @@ -211,13 +210,6 @@ describe('DonationStartNewPrimaryComponent', () => {
MatDialogModule,
MatIconModule,
MatInputModule,
MatomoModule.forRoot({
scriptUrl: `https://example.com/matomo.js`,
trackers: [],
routeTracking: {
enable: true,
}
}),
MatRadioModule,
MatProgressSpinnerModule,
MatSelectModule,
Expand Down
1 change: 0 additions & 1 deletion src/app/donation-thanks/donation-thanks.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import {MatDialogModule} from '@angular/material/dialog';
import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
import {ActivatedRoute} from '@angular/router';
import {RouterTestingModule} from '@angular/router/testing';
import { MatomoModule } from 'ngx-matomo';
import {InMemoryStorageService} from 'ngx-webstorage-service';
import {of} from 'rxjs';

Expand Down
2 changes: 1 addition & 1 deletion src/app/donation-thanks/donation-thanks.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Component, Input, OnInit, ViewChild } from '@angular/core';
import {DomSanitizer, SafeHtml} from "@angular/platform-browser";
import { MatDialog } from '@angular/material/dialog';
import { faExclamationTriangle } from '@fortawesome/free-solid-svg-icons';
import { MatomoTracker } from 'ngx-matomo';
import { MatomoTracker } from 'ngx-matomo-client';
import { RecaptchaComponent } from 'ng-recaptcha';

import { Campaign } from '../campaign.model';
Expand Down
9 changes: 1 addition & 8 deletions src/app/donation.service.spec.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
import { inject, TestBed } from '@angular/core/testing';
import { RouterTestingModule } from '@angular/router/testing';
import { MatomoModule } from 'ngx-matomo';
import {InMemoryStorageService, SESSION_STORAGE} from 'ngx-webstorage-service';

import { Donation } from './donation.model';
Expand Down Expand Up @@ -45,13 +44,7 @@ describe('DonationService', () => {
beforeEach(() => TestBed.configureTestingModule({
imports: [
HttpClientTestingModule,
MatomoModule.forRoot({
scriptUrl: `https://example.com/matomo.js`,
trackers: [],
routeTracking: {
enable: true,
}
}),

NgxMatomoModule.forRoot({
siteId: '',
trackerUrl: '',
Expand Down
8 changes: 0 additions & 8 deletions src/app/identity.service.spec.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
import { inject, TestBed } from '@angular/core/testing';
import { RouterTestingModule } from '@angular/router/testing';
import { MatomoModule } from 'ngx-matomo';
import { InMemoryStorageService } from 'ngx-webstorage-service';

import { IdentityService, TBG_DONATE_ID_STORAGE } from './identity.service';
Expand All @@ -21,13 +20,6 @@ describe('IdentityService', () => {
beforeEach(() => TestBed.configureTestingModule({
imports: [
HttpClientTestingModule,
MatomoModule.forRoot({
scriptUrl: `https://example.com/matomo.js`,
trackers: [],
routeTracking: {
enable: true,
}
}),
NgxMatomoModule.forRoot({
siteId: '',
trackerUrl: '',
Expand Down
8 changes: 0 additions & 8 deletions src/app/login-modal/login-modal.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { MatButtonModule } from '@angular/material/button';
import { MatDialogModule, MatDialogRef } from '@angular/material/dialog';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { ActivatedRoute } from '@angular/router';
import { MatomoModule } from 'ngx-matomo';
import { InMemoryStorageService } from 'ngx-webstorage-service';

import { LoginModalComponent } from './login-modal.component';
Expand All @@ -24,13 +23,6 @@ describe('LoginModalComponent', () => {
HttpClientTestingModule,
MatButtonModule,
MatDialogModule,
MatomoModule.forRoot({
scriptUrl: `https://example.com/matomo.js`,
trackers: [],
routeTracking: {
enable: true,
}
}),
NgxMatomoModule.forRoot({
siteId: '',
trackerUrl: '',
Expand Down
8 changes: 0 additions & 8 deletions src/app/my-account/my-account.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import {HttpClientModule} from "@angular/common/http";
import {NO_ERRORS_SCHEMA} from "@angular/core";
import {MatDialogModule} from "@angular/material/dialog";
import { MatomoModule } from 'ngx-matomo';
import {InMemoryStorageService} from "ngx-webstorage-service";
import {of} from "rxjs";
import {PaymentMethod} from "@stripe/stripe-js";
Expand All @@ -27,13 +26,6 @@ describe('MyAccountComponent', () => {
imports: [
HttpClientModule,
MatDialogModule,
MatomoModule.forRoot({
scriptUrl: `https://example.com/matomo.js`,
trackers: [],
routeTracking: {
enable: true,
}
}),
NgxMatomoModule.forRoot({
siteId: '',
trackerUrl: '',
Expand Down
8 changes: 0 additions & 8 deletions src/app/register-modal/register-modal.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { MatButtonModule } from '@angular/material/button';
import { MatDialogModule, MatDialogRef } from '@angular/material/dialog';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { MatomoModule } from 'ngx-matomo';
import { InMemoryStorageService } from 'ngx-webstorage-service';

import { RegisterModalComponent } from './register-modal.component';
Expand All @@ -24,13 +23,6 @@ describe('RegisterModalComponent', () => {
HttpClientTestingModule,
MatButtonModule,
MatDialogModule,
MatomoModule.forRoot({
scriptUrl: `https://example.com/matomo.js`,
trackers: [],
routeTracking: {
enable: true,
}
}),
NgxMatomoModule.forRoot({
siteId: '',
trackerUrl: '',
Expand Down
8 changes: 0 additions & 8 deletions src/app/reset-password/reset-password.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import { MatInputModule } from '@angular/material/input';
import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { RouterTestingModule } from '@angular/router/testing';
import { MatomoModule } from 'ngx-matomo';
import { InMemoryStorageService } from 'ngx-webstorage-service';

import { TBG_DONATE_STORAGE } from '../donation.service';
Expand All @@ -30,13 +29,6 @@ describe('ResetPasswordComponent', () => {
MatButtonModule,
MatDialogModule,
MatInputModule,
MatomoModule.forRoot({
scriptUrl: `https://example.com/matomo.js`,
trackers: [],
routeTracking: {
enable: true,
}
}),
NgxMatomoModule.forRoot({
siteId: '',
trackerUrl: '',
Expand Down
8 changes: 0 additions & 8 deletions src/app/stripe.service.spec.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { HttpClientTestingModule } from '@angular/common/http/testing';
import { TestBed } from '@angular/core/testing';
import { RouterTestingModule } from '@angular/router/testing';
import { MatomoModule } from 'ngx-matomo';
import { InMemoryStorageService } from 'ngx-webstorage-service';

import { TBG_DONATE_STORAGE } from './donation.service';
Expand All @@ -14,13 +13,6 @@ describe('StripeService', () => {
TestBed.configureTestingModule({
imports: [
HttpClientTestingModule,
MatomoModule.forRoot({
scriptUrl: `https://example.com/matomo.js`,
trackers: [],
routeTracking: {
enable: true,
}
}),
RouterTestingModule,
],
providers: [
Expand Down
8 changes: 0 additions & 8 deletions src/app/transfer-funds/transfer-funds.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import { MatSelectModule } from '@angular/material/select';
import { MatStepperModule } from '@angular/material/stepper';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { RouterTestingModule } from '@angular/router/testing';
import { MatomoModule } from 'ngx-matomo';
import { InMemoryStorageService } from 'ngx-webstorage-service';

import { TBG_DONATE_STORAGE } from '../donation.service';
Expand All @@ -35,13 +34,6 @@ describe('TransferFundsComponent', () => {
MatDialogModule,
MatIconModule,
MatInputModule,
MatomoModule.forRoot({
scriptUrl: `https://example.com/matomo.js`,
trackers: [],
routeTracking: {
enable: true,
}
}),
NgxMatomoModule.forRoot({
siteId: '',
trackerUrl: '',
Expand Down
2 changes: 1 addition & 1 deletion src/app/transfer-funds/transfer-funds.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {FormBuilder, FormGroup, Validators} from '@angular/forms';
import {MatAutocompleteSelectedEvent} from '@angular/material/autocomplete';
import {MatDialog} from '@angular/material/dialog';
import {MatSelectChange} from '@angular/material/select';
import {MatomoTracker} from 'ngx-matomo';
import {MatomoTracker} from 'ngx-matomo-client';
import {EMPTY} from 'rxjs';
import {debounceTime, distinctUntilChanged, startWith, switchMap} from 'rxjs/operators';

Expand Down

0 comments on commit 2e146f6

Please sign in to comment.