Skip to content

Allow test files multiple target frameworks #350

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

Open
ramijarrar wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Allow test files multiple target frameworks #350

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 9 additions & 6 deletions src/core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,8 @@ CONTINUOUS_INTEGRATION = process.env.VELOCITY_CI;
VelocityTestReports.remove({framework: name});
VelocityLogs.remove({framework: name});
VelocityAggregateReports.remove({name: name});
VelocityTestFiles.remove({targetFramework: name});
VelocityTestFiles.update({}, {$pull: {targetFramework: name}});
VelocityTestFiles.remove({targetFramework: []});

delete _config[name];
}
Expand Down Expand Up @@ -651,6 +652,7 @@ CONTINUOUS_INTEGRATION = process.env.VELOCITY_CI;
_watcher.on('add', Meteor.bindEnvironment(function (filePath) {
var relativePath,
packageRelativePath,
matchedFrameworks,
targetFramework,
data;

Expand All @@ -676,26 +678,27 @@ CONTINUOUS_INTEGRATION = process.env.VELOCITY_CI;
relativePath.split('/').slice(2).join('/') :
relativePath;

// test against each test framework's regexp matcher, use first one that matches
targetFramework = _.find(config, function (framework) {
// test against each test framework's regexp matcher and format matches
matchedFrameworks = _.filter(config, function (framework) {
return framework._regexp.test(packageRelativePath);
});
targetFramework = _.pluck(matchedFrameworks, 'name');

if (targetFramework) {
DEBUG && console.log('[velocity] Target framework for', relativePath, 'is', targetFramework.name);
DEBUG && console.log('[velocity] Target frameworks for', relativePath, 'are', targetFramework);

data = {
_id: filePath,
name: files.pathBasename(filePath),
absolutePath: filePath,
relativePath: relativePath,
targetFramework: targetFramework.name,
targetFramework: targetFramework,
lastModified: Date.now()
};

VelocityTestFiles.insert(data);
} else {
DEBUG && console.log('[velocity] No framework registered for', relativePath);
DEBUG && console.log('[velocity] No frameworks registered for', relativePath);
}
})); // end watcher.on 'add'

Expand Down