Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove unused tests to improve CI stability #4553

Merged
merged 18 commits into from
Jul 8, 2024
Merged

remove unused tests to improve CI stability #4553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
89e8289
use spec reporter for karma
tomaskikutis Jun 18, 2024
26dfda6
check if permissions tests are breaking ci
tomaskikutis Jun 18, 2024
06d0d31
Revert "check if permissions tests are breaking ci"
tomaskikutis Jun 19, 2024
cf43960
Merge branch 'develop' into check-if-permissions-tests-are-breaking-ci
tomaskikutis Jun 19, 2024
722a5da
drop unused permissions directive / service
tomaskikutis Jun 19, 2024
69f7308
improve async tests
tomaskikutis Jun 19, 2024
e0583eb
use done in async test
tomaskikutis Jun 20, 2024
fec4d4f
drop tests that were never working (would pass without waiting for pr…
tomaskikutis Jun 20, 2024
ca64f3d
use "done" callback for async tests
tomaskikutis Jun 21, 2024
b013fdb
use single beforeEach
tomaskikutis Jun 24, 2024
fccf093
Revert "use single beforeEach"
tomaskikutis Jun 24, 2024
40900bc
see if dropping spellcheck tests fixed unit tests
tomaskikutis Jun 24, 2024
64d878e
fix test can provide config
tomaskikutis Jun 25, 2024
7b9b149
Revert "see if dropping spellcheck tests fixed unit tests"
tomaskikutis Jun 25, 2024
e63e703
retry unit tests
tomaskikutis Jun 25, 2024
0b9f206
Merge branch 'develop' into check-if-permissions-tests-are-breaking-ci
tomaskikutis Jun 25, 2024
433444b
remove usage of previously removed permissions service
tomaskikutis Jun 26, 2024
652eeaf
use absolute path to avoid from crashing locally
tomaskikutis Jun 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- run: echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p

- run: npm ci
- run: npm run test
- run: npm run test || npm run test || npm run test
env:
TZ: "Europe/Prague"

Expand Down
3 changes: 2 additions & 1 deletion e2e/client/playwright.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import {defineConfig, devices} from '@playwright/test';
import path from 'path';

/**
* Read environment variables from file.
Expand Down Expand Up @@ -40,7 +41,7 @@ export default defineConfig({
name: 'chromium',
use: {
...devices['Desktop Chrome'],
storageState: 'playwright/.auth/user.json',
storageState: path.join(__dirname, './playwright/.auth/user.json'),
},
},

Expand Down
145 changes: 78 additions & 67 deletions scripts/apps/archive/tests/family.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,62 +41,57 @@ describe('family service', () => {
});
}));

it('can fetch members of a family', inject(($rootScope, familyService, api) => {
let members = null;

it('can fetch members of a family', (done) => inject(($rootScope, familyService, api) => {
familyService.fetchItems('family1')
.then((result) => {
members = result;
.then((members) => {
expect(members._items.length).toBe(2);
done();
});

$rootScope.$digest();
expect(members._items.length).toBe(2);
}));

it('can fetch members of a family with exclusion', inject(($rootScope, familyService, api) => {
let members = null;

it('can fetch members of a family with exclusion', (done) => inject(($rootScope, familyService, api) => {
familyService.fetchItems('family1', {unique_id: 1, _id: 'z'})
.then((result) => {
members = result;
.then((members) => {
expect(members._items.length).toBe(1);
done();
});

$rootScope.$digest();
expect(members._items.length).toBe(1);
}));

it('can fetch desks of members of a family', inject(($rootScope, familyService, api, desks) => {
let memberDesks = null;

it('can fetch desks of members of a family', (done) => inject(($rootScope, familyService) => {
familyService.fetchDesks({_id: 'z', family_id: 'family1'})
.then((result) => {
memberDesks = result;
.then((memberDesks) => {
expect(memberDesks.length).toBe(1);
done();
});

$rootScope.$digest();
expect(memberDesks.length).toBe(1);
}));

it('can determine weather a user is member of fetched desk',
inject(($rootScope, familyService, api, desks) => {
let memberDesks = null;

(done) => inject(($rootScope, familyService) => {
familyService.fetchDesks({_id: 'z', family_id: 'family1', task: {desk: 'desk1'}})
.then((result) => {
memberDesks = result;
.then((memberDesks) => {
expect(memberDesks.length).toBe(1);
expect(memberDesks[0].isUserDeskMember).toBe(true);
done();
});

$rootScope.$digest();
expect(memberDesks.length).toBe(1);
expect(memberDesks[0].isUserDeskMember).toBe(true);
}));

it('can fetch desks of members of a family with exclusion',
inject(($rootScope, familyService, api, desks) => {
let memberDesks = null;

(done) => inject(($rootScope, familyService) => {
familyService.fetchDesks({unique_id: 1, _id: 'z', family_id: 'family1'}, true)
.then((result) => {
memberDesks = result;
.then((memberDesks) => {
expect(memberDesks.length).toBe(0);
done();
});

$rootScope.$digest();
expect(memberDesks.length).toBe(0);
}));

it('can use item._id for ingest items instead of family id',
Expand All @@ -114,7 +109,7 @@ describe('family service', () => {
event_id: 1,
};

it('can query related items', inject(($rootScope, $q, familyService, api) => {
it('can query related items', (done) => inject(($rootScope, $q, familyService, api) => {
const query = {
repo: 'archive,published',
source: {
Expand All @@ -136,44 +131,52 @@ describe('family service', () => {
};

spyOn(api, 'query').and.returnValue($q.when());
familyService.fetchRelatedItems({event_id: 1}).then();

familyService.fetchRelatedItems({event_id: 1}).then(() => {
expect(api.query).toHaveBeenCalledWith('search', query);
done();
});
$rootScope.$digest();
expect(api.query).toHaveBeenCalledWith('search', query);
}));

it('can query relatable items with empty match criteria', inject(($rootScope, $q, familyService, api) => {
const query = {
repo: 'archive,published',
source: {
query: {
filtered: {
filter: {
and: [
{not: {term: {state: 'spiked'}}},
{not: {term: {event_id: 1}}},
{not: {term: {type: 'composite'}}},
{not: {term: {last_published_version: 'false'}}},
{term: {type: 'text'}},
],
},
query: {
query_string: {query: 'slugline.phrase:("test")', lenient: true},
it('can query relatable items with empty match criteria',
(done) => inject(($rootScope, $q, familyService, api) => {
const query = {
repo: 'archive,published',
source: {
query: {
filtered: {
filter: {
and: [
{not: {term: {state: 'spiked'}}},
{not: {term: {event_id: 1}}},
{not: {term: {type: 'composite'}}},
{not: {term: {last_published_version: 'false'}}},
{term: {type: 'text'}},
],
},
query: {
query_string: {query: 'slugline.phrase:("test")', lenient: true},
},
},
},
size: 200,
from: 0,
sort: {firstcreated: 'asc'},
},
size: 200,
from: 0,
sort: {firstcreated: 'asc'},
},
};
};

spyOn(api, 'query').and.returnValue($q.when());
familyService.fetchRelatableItems('test', '', item).then();
$rootScope.$digest();
expect(api.query).toHaveBeenCalledWith('search', query);
}));
spyOn(api, 'query').and.returnValue($q.when());

it('can query relatable items with prefix criteria', inject(($rootScope, $q, familyService, api) => {
familyService.fetchRelatableItems('test', '', item).then(() => {
expect(api.query).toHaveBeenCalledWith('search', query);
done();
});

$rootScope.$digest();
}));

it('can query relatable items with prefix criteria', (done) => inject(($rootScope, $q, familyService, api) => {
const query = {
repo: 'archive,published',
source: {
Expand All @@ -200,12 +203,16 @@ describe('family service', () => {
};

spyOn(api, 'query').and.returnValue($q.when());
familyService.fetchRelatableItems('test', 'PREFIX', item).then();

familyService.fetchRelatableItems('test', 'PREFIX', item).then(() => {
expect(api.query).toHaveBeenCalledWith('search', query);
done();
});

$rootScope.$digest();
expect(api.query).toHaveBeenCalledWith('search', query);
}));

it('can query relatable items with date range', inject(($rootScope, $q, familyService, api) => {
it('can query relatable items with date range', (done) => inject(($rootScope, $q, familyService, api) => {
const query = {
repo: 'archive,published',
source: {
Expand Down Expand Up @@ -233,9 +240,13 @@ describe('family service', () => {
};

spyOn(api, 'query').and.returnValue($q.when());
familyService.fetchRelatableItems('test', 'PREFIX', item, '48-h').then();

familyService.fetchRelatableItems('test', 'PREFIX', item, '48-h').then(() => {
expect(api.query).toHaveBeenCalledWith('search', query);
done();
});

$rootScope.$digest();
expect(api.query).toHaveBeenCalledWith('search', query);
}));
});
});
147 changes: 0 additions & 147 deletions scripts/apps/archive/tests/upload.spec.ts
View file
Open in desktop

This file was deleted.

Loading
Loading