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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ All notable changes to the [Fluxnova Modeler](https://github.com/finos/fluxnova-

**\_Note:** Yet to be released changes appear here.\_

## 1.2.0

- Added retry time cycle functionality for element templates
- Enabled hybrid model for Karma to Jest to enable running of both suites in parallel

## 1.1.1

- Fixed issue with broken Monitoring link
Expand Down
4 changes: 2 additions & 2 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = {
presets: ['@babel/preset-env']
};
presets: [ '@babel/preset-env' ]
};
6 changes: 3 additions & 3 deletions client/src/app/__tests__/TabsProviderSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ describe('TabsProvider', function() {
const { file: { contents } } = tabsProvider.createTab('bpmn');

// then
expect(contents).to.include('modeler:executionPlatformVersion="1.0.0"');
expect(contents).to.include('modeler:executionPlatformVersion="2.0.0"');
});


Expand All @@ -269,7 +269,7 @@ describe('TabsProvider', function() {
const { file: { contents } } = tabsProvider.createTab('dmn');

// then
expect(contents).to.include('modeler:executionPlatformVersion="1.0.0"');
expect(contents).to.include('modeler:executionPlatformVersion="2.0.0"');
});


Expand All @@ -285,7 +285,7 @@ describe('TabsProvider', function() {
const { file: { contents } } = tabsProvider.createTab('form');

// then
expect(contents).to.include('"executionPlatformVersion": "1.0.0"');
expect(contents).to.include('"executionPlatformVersion": "2.0.0"');
});

describe('invalid flag', function() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export default class JobExecutionExtensionProvider {
}
}

JobExecutionExtensionProvider.$inject = [ 'propertiesPanel' ];
JobExecutionExtensionProvider.$inject = [ 'propertiesPanel' ];

function isAdjacentGroup(group) {
const entries = group.entries;
Expand Down
4 changes: 2 additions & 2 deletions client/src/util/Engines.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ export const ENGINE_PROFILES = [
},
{
executionPlatform: ENGINES.FLUXNOVA,
executionPlatformVersions: [ '1.0.0' ],
latestStable: '1.0.0'
executionPlatformVersions: [ '1.0.0' ,'2.0.0' ],
latestStable: '2.0.0'
}
];

Expand Down
2 changes: 1 addition & 1 deletion client/src/util/__tests__/EnginesSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ describe('util/Engines', function() {

it('Camunda Platform', verifyLatestStable(ENGINES.PLATFORM, '7.22.0'));

it('Fluxnova Platform', verifyLatestStable(ENGINES.FLUXNOVA, '1.0.0'));
it('Fluxnova Platform', verifyLatestStable(ENGINES.FLUXNOVA, '2.0.0'));

it('Camunda Cloud', verifyLatestStable(ENGINES.CLOUD, '8.6.0'));

Expand Down
38 changes: 19 additions & 19 deletions jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
const config = {

// The root directory that Jest should scan for tests and modules within
rootDir: "./",
rootDir: './',

// Automatically clear mock calls, instances, contexts and results before every test
clearMocks: true,
Expand All @@ -17,42 +17,42 @@ const config = {

// An array of glob patterns indicating a set of files for which coverage information should be collected
collectCoverageFrom: [
"<rootDir>/client/src/**/*.js",
"<rootDir>/app/**/*.js",
"!<rootDir>/client/src/**/__tests__/**",
"!<rootDir>/app/**/__tests__/**",
"!<rootDir>/app/public/**",
"!<rootDir>/app/preload/**",
'<rootDir>/client/src/**/*.js',
'<rootDir>/app/**/*.js',
'!<rootDir>/client/src/**/__tests__/**',
'!<rootDir>/app/**/__tests__/**',
'!<rootDir>/app/public/**',
'!<rootDir>/app/preload/**',
],

// The directory where Jest should output its coverage files
coverageDirectory: "<rootDir>/coverage",
coverageDirectory: '<rootDir>/coverage',

// Indicates which provider should be used to instrument code for coverage
coverageProvider: "v8",
coverageProvider: 'v8',

// An object that configures minimum threshold enforcement for coverage results
coverageThreshold: {
global: {
coverageThreshold: {
global: {
lines: 0,
statements: 0,
}
}
},

// The test environment that will be used for testing
testEnvironment: "jsdom",
testEnvironment: 'jsdom',

// The glob patterns Jest uses to detect test files
testMatch: ["**/?(*.)+(spec|test).js"],
testMatch: [ '**/?(*.)+(spec|test).js' ],

// A map from regular expressions to paths to transformers
transform: {
"^.+\\.(ts|js|jsx)$": "babel-jest",
".+\\.(svg|css|styl|less|sass|scss|png|jpg|ttf|woff|woff2|jpeg)$":
"jest-transform-stub",
"^.+\\.(bpmn)$": "<rootDir>/jest-raw-loader.js",
'^.+\\.(ts|js|jsx)$': 'babel-jest',
'.+\\.(svg|css|styl|less|sass|scss|png|jpg|ttf|woff|woff2|jpeg)$':
'jest-transform-stub',
'^.+\\.(bpmn)$': '<rootDir>/jest-raw-loader.js',
},

};

module.exports = config;
module.exports = config;
Loading