📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!
TypeScript chartsclickhousedockergdprgoogle-analyticsmetricsmonitoringmysqlnestjsprivacyredisself-hostedselfhostedstatisticstailwindcssweb-analyticswebanalyticswebsite
Merge branch 'main' into main
Andrii Re195feac78f3
diff --cc src/analytics/analytics.controller.spec.tsindex fcc085b9a,cc415e54f..463461772--- a/src/analytics/analytics.controller.spec.ts+++ b/src/analytics/analytics.controller.spec.ts@@@ -56,12 -51,7 +56,11 @@@ describe('AnalyticsController', () =>},],}).compile()-controller = module.get<AnalyticsController>(AnalyticsController)+ userRepository = module.get<Repository<User>>(USER_REPOSITORY_TOKEN)+ actionTokenRepository = module.get<Repository<ActionToken>>(ACTION_TOKEN_REPOSITORY_TOKEN)+ projectShareRepository = module.get<Repository<ProjectShare>>(PROJECT_SHARE_REPOSITORY_TOKEN)+ projectsRepository = module.get<Repository<Project>>(PROJECT_REPOSITORY_TOKEN)})describe('root', () => {diff --cc src/analytics/analytics.service.spec.tsindex 63621c742,1a4f58de3..031fcbbd4--- a/src/analytics/analytics.service.spec.ts+++ b/src/analytics/analytics.service.spec.ts@@@ -17,23 -15,25 +17,28 @@@ describe('AnalyticsService', () =>beforeEach(async () => {const module: TestingModule = await Test.createTestingModule({providers: [- AnalyticsService,- ProjectService,+ AnalyticsService,+ ProjectService,{provide: PROJECT_REPOSITORY_TOKEN,- useValue: { create: jest.fn(), save: jest.fn(), findOne: jest.fn() },+ useValue: { count: jest.fn(), save: jest.fn(), update: jest.fn(), delete: jest.fn(), findOne: jest.fn(), find: jest.fn() },},+ ProjectService,{- provide: PROJECTSHARE_REPOSITORY_TOKEN,- useValue: { create: jest.fn(), save: jest.fn(), findOne: jest.fn() },- },+ provide: PROJECT_SHARE_REPOSITORY_TOKEN,+ useValue: { count: jest.fn(), save: jest.fn(), update: jest.fn(), delete: jest.fn(), findOne: jest.fn(), find: jest.fn() },+ }],}).compile()-+ projectsRepository = module.get<Repository<Project>>(+ PROJECT_REPOSITORY_TOKEN,+ )+ projectShareRepository = module.get<Repository<ProjectShare>>(+ PROJECTSHARE_REPOSITORY_TOKEN,+ )service = module.get<AnalyticsService>(AnalyticsService)+ projectShareRepository = module.get<Repository<ProjectShare>>(PROJECT_SHARE_REPOSITORY_TOKEN)+ projectsRepository = module.get<Repository<Project>>(PROJECT_REPOSITORY_TOKEN)})describe('root', () => {diff --cc src/auth/auth.controller.spec.tsindex 47e343ab9,3518848e9..e79a4cb01--- a/src/auth/auth.controller.spec.ts+++ b/src/auth/auth.controller.spec.ts@@@ -1,17 -1,17 +1,16 @@@--import { Test, TestingModule } from '@nestjs/testing'-import { ActionTokensService } from 'src/action-tokens/action-tokens.service'-import { AppLoggerService } from 'src/logger/logger.service'-import { MailerService } from 'src/mailer/mailer.service'-import { ProjectService } from 'src/project/project.service'-import { UserService } from 'src/user/user.service'+import { getRepositoryToken } from '@nestjs/typeorm'import { AuthController } from './auth.controller'+import { UserService } from '../user/user.service'import { AuthService } from './auth.service'-import { ProjectShare } from 'src/project/entity/project-share.entity'-import { getRepositoryToken } from '@nestjs/typeorm'-import { User } from 'src/user/entities/user.entity'-import { ActionToken } from 'src/action-tokens/action-token.entity'-import { Project } from 'src/project/entity/project.entity'+import { MailerService } from '../mailer/mailer.service'+import { ActionTokensService } from '../action-tokens/action-tokens.service'+import { ProjectService } from '../project/project.service'+import { AppLoggerService } from '../logger/logger.service'+import { User } from '../user/entities/user.entity'import { Repository } from 'typeorm'+import { ActionToken } from '../action-tokens/action-token.entity'+import { Project } from '../project/entity/project.entity'+import { ProjectShare } from '../project/entity/project-share.entity'describe('AuthController', () => {let controller: AuthControllerdiff --cc src/auth/auth.service.spec.tsindex 3f34f7cfd,36039b771..430d7f7a7--- a/src/auth/auth.service.spec.ts+++ b/src/auth/auth.service.spec.ts@@@ -31,51 -32,8 +31,51 @@@ describe('AuthService', () =>})describe('root', () => {- it('should be defined', () => {+ it('should be defined service', () => {expect(service).toBeDefined()+ }),+ it('should be defined repository', () => {+ expect(repository).toBeDefined()+ })+ }),+ describe('auth.service definding', () => {+ it('should be defined checkIfPasswordLeaked()', () => {+ expect(service.checkIfPasswordLeaked).toBeDefined()+ }),+ it('should be defined checkPassword()', () => {+ expect(service.checkPassword).toBeDefined()+ }),+ it('should be defined get()', () => {+ expect(service.get).toBeDefined()+ }),+ it('should be defined hashPassword()', () => {+ expect(service.hashPassword).toBeDefined()+ }),+ it('should be defined login()', () => {+ expect(service.login).toBeDefined()+ }),+ it('should be defined postLoginProcess()', () => {+ expect(service.postLoginProcess).toBeDefined()+ }),+ it('should be defined processUser()', () => {+ expect(service.processUser).toBeDefined()+ }),+ it('should be defined sha1hash()', () => {+ expect(service.sha1hash).toBeDefined()+ }),+ it('should be defined validateUser()', () => {+ expect(service.validateUser).toBeDefined()})})+ // describe('auth.service testing', () => {+ // it('should return correct hashPassword()', async () => {+ // const password = 'test'+ // const salt = await bcrypt.genSalt(10)+ // const hashedStringFromService = await service.hashPassword(password)+ // const hashedPass = await bcrypt.hash(password, salt)+ // console.log('Hashed password1: ' + hashedStringFromService)+ // console.log('Hashed password2: ' + hashedPass)+ // expect(hashedStringFromService).toEqual(hashedPass)+ // })+ // })- })+ })