diff --git a/tests/e2e/api/items/many-to-many.test.ts b/tests/e2e/api/items/many-to-many.test.ts index ace6b8ade7aaa..952f341854771 100644 --- a/tests/e2e/api/items/many-to-many.test.ts +++ b/tests/e2e/api/items/many-to-many.test.ts @@ -4,6 +4,7 @@ import config from '../../config'; import { getDBsToTest } from '../../get-dbs-to-test'; import knex, { Knex } from 'knex'; import { createArtist, createEvent, createMany, seedTable, Item } from '../../setup/utils/factories'; + describe('/items', () => { const databases = new Map(); @@ -122,16 +123,10 @@ describe('/items', () => { expect(await databases.get(vendor)!('artists').select('name').where('id', artist.id)).toMatchObject([ { name: artist.name }, ]); - if (vendor === 'postgres10') { - const cost = Math.round(event.cost * 10) / 10; - expect(await databases.get(vendor)!('events').select('cost').where('id', event.id)).toMatchObject([ - { cost: cost }, - ]); - } else { - expect(await databases.get(vendor)!('events').select('cost').where('id', event.id)).toMatchObject([ - { cost: event.cost }, - ]); - } + + expect(await databases.get(vendor)!('events').select('cost').where('id', event.id)).toMatchObject([ + { cost: event.cost }, + ]); }); }); describe('/:collection GET', () => { @@ -258,16 +253,9 @@ describe('/items', () => { }, }); for (let row = 0; row < response.data.data.length; row++) { - if (vendor === 'postgres10') { - const cost = Math.round(event.cost * 10) / 10; - expect(response.data.data[row].events_id).toMatchObject({ - cost: cost, - }); - } else { - expect(response.data.data[row].events_id).toMatchObject({ - cost: event.cost, - }); - } + expect(response.data.data[row].events_id).toMatchObject({ + cost: event.cost, + }); } expect(response.data.data.length).toBe(keys.length); }); @@ -314,12 +302,8 @@ describe('/items', () => { expect(await databases.get(vendor)!('artists_events').select('*').where('id', items[row].id)).toStrictEqual([]); } expect((await databases.get(vendor)!('artists').select('name').where('id', artist.id))[0].name).toBe(artist.name); - if (vendor === 'postgres10') { - const cost = Math.round(event.cost * 10) / 10; - expect((await databases.get(vendor)!('events').select('cost').where('id', event.id))[0].cost).toBe(cost); - } else { - expect((await databases.get(vendor)!('events').select('cost').where('id', event.id))[0].cost).toBe(event.cost); - } + + expect((await databases.get(vendor)!('events').select('cost').where('id', event.id))[0].cost).toBe(event.cost); }); }); }); diff --git a/tests/e2e/setup/seeds/04_directus_users.js b/tests/e2e/setup/seeds/04_directus_users.js index 644891b0120e1..583dc75a1c4db 100644 --- a/tests/e2e/setup/seeds/04_directus_users.js +++ b/tests/e2e/setup/seeds/04_directus_users.js @@ -1,4 +1,4 @@ -const generateHash = require('../utils/generateHash'); +const generateHash = require('../utils/setup-utils'); exports.seed = async function (knex) { return await knex('directus_users').insert([ diff --git a/tests/e2e/setup/utils/factories.ts b/tests/e2e/setup/utils/factories.ts index 60e923e66c5c9..ae44ee2ebfbbe 100644 --- a/tests/e2e/setup/utils/factories.ts +++ b/tests/e2e/setup/utils/factories.ts @@ -138,7 +138,7 @@ export const createArtist = (): Artist => ({ export const createEvent = (): Event => ({ id: uuid(), - cost: datatype.float(), + cost: datatype.number(), description: lorem.paragraphs(2), created_at: randomDateTime(new Date(1030436120350), new Date(1633466120350)), time: randomTime(), diff --git a/tests/e2e/setup/utils/generateHash.js b/tests/e2e/setup/utils/setup-utils.js similarity index 100% rename from tests/e2e/setup/utils/generateHash.js rename to tests/e2e/setup/utils/setup-utils.js