Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
- Build:
- FIXED: Reduce MSVC compiler warnings by suppressing informational warnings while preserving bug-indicating warnings [#7253](https://github.com/Project-OSRM/osrm-backend/issues/7253)
- Misc:
- CHANGED: Upgrade FlatBuffers to v25.9.23 with TypeScript workflow [#7235](https://github.com/Project-OSRM/osrm-backend/issues/7235)
- CHANGED: Add std::format compatibility layer with fallback to fmt::format [#7261](https://github.com/Project-OSRM/osrm-backend/pull/7261)
- FIXED: Update node_osrm to C++20 to fix ABI mismatch with libosrm (was overlooked in #6877) [#7261](https://github.com/Project-OSRM/osrm-backend/pull/7261)
- CHANGED: Update fmt library to version 11.2.0 [#7238](https://github.com/Project-OSRM/osrm-backend/issues/7238)
Expand Down
4 changes: 3 additions & 1 deletion eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ import { Linter } from 'eslint';

/** @type {Linter.Config} */
const config = [
{
ignores: ['node_modules/', 'build/', 'dist/', 'coverage/', 'features/support/osrm/'],
},
{
files: ["**/*.js"],
languageOptions: {
Expand All @@ -25,7 +28,6 @@ const config = [
'prefer-template': 'error',
'prefer-arrow-callback': 'error',
},
ignores: ['node_modules/', 'build/', 'dist/', 'coverage/', 'features/support/fbresult_generated.js'],
},
];

Expand Down
3 changes: 1 addition & 2 deletions features/step_definitions/distance_matrix.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
import util from 'util';

import flatbuffers from 'flatbuffers';
import { osrm } from '../support/fbresult_generated.js';
const FBResult = osrm.engine.api.fbresult.FBResult;
import { FBResult } from '../support/osrm/engine/api/fbresult/fbresult.js';
import { When } from '@cucumber/cucumber';

// Regular expressions for matching different matrix API test scenarios
Expand Down
3 changes: 1 addition & 2 deletions features/step_definitions/nearest.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
import util from 'util';

import flatbuffers from 'flatbuffers';
import { osrm } from '../support/fbresult_generated.js';
const FBResult = osrm.engine.api.fbresult.FBResult;
import { FBResult } from '../support/osrm/engine/api/fbresult/fbresult.js';
import { When } from '@cucumber/cucumber';

When(/^I request nearest I should get$/, function (table, callback) {
Expand Down
6 changes: 4 additions & 2 deletions features/support/env.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@ import tryConnect from '../lib/try_connect.js';
import { setDefaultTimeout } from '@cucumber/cucumber';

// Set global timeout for all steps and hooks
// Use higher timeout on macOS due to slower performance
const DEFAULT_TIMEOUT = process.platform === 'darwin' ? 10000 : 5000;
setDefaultTimeout(
(process.env.CUCUMBER_TIMEOUT && parseInt(process.env.CUCUMBER_TIMEOUT)) ||
5000,
DEFAULT_TIMEOUT,
);

// Sets up all constants that are valid for all features
Expand All @@ -21,7 +23,7 @@ export default class Env {

// Initializes all environment constants and paths for test execution
initializeEnv(callback) {
this.TIMEOUT = parseInt(process.env.CUCUMBER_TIMEOUT) || 5000;
this.TIMEOUT = parseInt(process.env.CUCUMBER_TIMEOUT) || DEFAULT_TIMEOUT;
this.ROOT_PATH = process.cwd();

this.TEST_PATH = path.resolve(this.ROOT_PATH, 'test');
Expand Down
Loading
Loading