-
Notifications
You must be signed in to change notification settings - Fork 8
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.
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
Remove karma dependencies - no longer maintained #331
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
c31cc44
Remove karma dependencies - no longer maintained
0c19c70
Upgrade executor again
45ebf59
fix-esm
ca01747
Downgrade mime - they wont support require
a792e1f
Unbreak broken logic in auth
5fb817f
Fix linting errors
85e8bc0
Fix mistake
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -367,8 +367,8 @@ function clearDBAndGetGMEAuth(gmeConfigParameter, projectNameOrNames, callback) | |
| }; | ||
|
|
||
| return Q.allDone([ | ||
| gmeAuth.addUser(guestAccount, guestAccount + '@example.com', guestAccount, true, {overwrite: true}), | ||
| gmeAuth.addUser('admin', '[email protected]', 'admin', true, {overwrite: true, siteAdmin: true}) | ||
| gmeAuth.addUser(guestAccount, guestAccount + '@example.com', guestAccount, true, { overwrite: true }), | ||
| gmeAuth.addUser('admin', '[email protected]', 'admin', true, { overwrite: true, siteAdmin: true }) | ||
| ]); | ||
| }) | ||
| .then(function () { | ||
|
|
@@ -429,29 +429,33 @@ function importProject(storage, parameters, callback) { | |
| branchName, | ||
| data = {}; | ||
|
|
||
| // Parameters check. | ||
| exports.expect(typeof storage).to.equal('object'); | ||
| exports.expect(typeof parameters).to.equal('object'); | ||
| exports.expect(typeof parameters.projectName).to.equal('string'); | ||
| exports.expect(typeof parameters.gmeConfig).to.equal('object'); | ||
| exports.expect(typeof parameters.logger).to.equal('object'); | ||
|
|
||
| if (Object.hasOwn(parameters, 'username')) { | ||
| exports.expect(typeof parameters.username).to.equal('string'); | ||
| data.username = parameters.username; | ||
| } | ||
| try { | ||
| // Parameters check. | ||
| exports.expect(typeof storage).to.equal('object'); | ||
| exports.expect(typeof parameters).to.equal('object'); | ||
| exports.expect(typeof parameters.projectName).to.equal('string'); | ||
| exports.expect(typeof parameters.gmeConfig).to.equal('object'); | ||
| exports.expect(typeof parameters.logger).to.equal('object'); | ||
|
|
||
| if (Object.hasOwn(parameters, 'username')) { | ||
| exports.expect(typeof parameters.username).to.equal('string'); | ||
| data.username = parameters.username; | ||
| } | ||
|
|
||
| if (Object.hasOwn(parameters, 'ownerId')) { | ||
| exports.expect(typeof parameters.ownerId).to.equal('string'); | ||
| data.ownerId = parameters.ownerId; | ||
| } | ||
| if (Object.hasOwn(parameters, 'ownerId')) { | ||
| exports.expect(typeof parameters.ownerId).to.equal('string'); | ||
| data.ownerId = parameters.ownerId; | ||
| } | ||
|
|
||
| if (Object.hasOwn(parameters, 'kind')) { | ||
| exports.expect(typeof parameters.kind).to.equal('string'); | ||
| data.kind = parameters.kind; | ||
| if (Object.hasOwn(parameters, 'kind')) { | ||
| exports.expect(typeof parameters.kind).to.equal('string'); | ||
| data.kind = parameters.kind; | ||
| } | ||
| } catch (err) { | ||
| extractDeferred.reject(err); | ||
| } | ||
|
|
||
| if (typeof parameters.projectSeed === 'string' && parameters.projectSeed.toLowerCase().indexOf('.webgmex')) { | ||
| if (typeof parameters.projectSeed === 'string' && parameters.projectSeed.toLowerCase().indexOf('.webgmex') > -1) { | ||
| BC = require('../src/server/middleware/blob/BlobClientWithFSBackend'); | ||
| blobClient = new BC(parameters.gmeConfig, parameters.logger); | ||
| cliImport = require('../src/bin/import'); | ||
|
|
@@ -476,10 +480,7 @@ function importProject(storage, parameters, callback) { | |
| return storage.createProject(data); | ||
| }) | ||
| .then(function (project) { | ||
| var core = new exports.Core(project, { | ||
| globConf: parameters.gmeConfig, | ||
| logger: parameters.logger | ||
| }), | ||
| var core = new exports.Core(project, { globConf: parameters.gmeConfig, logger: parameters.logger }), | ||
| result = { | ||
| status: null, | ||
| branchName: branchName, | ||
|
|
@@ -519,9 +520,7 @@ function importProject(storage, parameters, callback) { | |
| }) | ||
| .catch(deferred.reject); | ||
| }) | ||
| .catch(function (err) { | ||
| deferred.reject(err); | ||
| }); | ||
| .catch(deferred.reject); | ||
|
|
||
| return deferred.promise.nodeify(callback); | ||
| } | ||
|
|
@@ -622,7 +621,7 @@ function openSocketIo(server, agent, userName, password, token) { | |
| deferred = Q.defer(), | ||
| loginPromise, | ||
| socket, | ||
| socketReq = {url: serverBaseUrl}, | ||
| socketReq = { url: serverBaseUrl }, | ||
| webgmeToken; | ||
|
|
||
| if (server.getGmeConfig().authentication.enable === true) { | ||
|
|
@@ -662,7 +661,7 @@ function openSocketIo(server, agent, userName, password, token) { | |
| }); | ||
|
|
||
| socket.on('connect', function () { | ||
| deferred.resolve({socket: socket, webgmeToken: webgmeToken}); | ||
| deferred.resolve({ socket: socket, webgmeToken: webgmeToken }); | ||
| }); | ||
| }) | ||
| .catch(function (err) { | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Messed this up on the last PR.