Skip to content

Spike: Camel case syntax #784

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

Draft
papandreou wants to merge 19 commits into
base: master
Choose a base branch
from
Draft

Spike: Camel case syntax #784

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
5b126fe
Sketch out some basic tests
papandreou Dec 21, 2020
f59f4e3
Slow, naive implementation of the basic cases
papandreou Dec 22, 2020
b211873
Support camel case syntax within an assertion
papandreou Dec 22, 2020
5a1d6c1
Add expect.it shorthands
papandreou Dec 22, 2020
933f822
Fix additional promise methods and expect.it
papandreou Dec 23, 2020
ff045ca
Remove no longer relevant test
papandreou Dec 23, 2020
9836925
wrapped expect: Back to just using addAdditionalPromiseMethods
papandreou Dec 23, 2020
2bcf9a4
Expect the full context to be captured when delegating from a middle …
papandreou Dec 27, 2020
9aea0a4
WIP
papandreou Feb 20, 2022
d713df1
Fiddle
papandreou May 29, 2022
0ac7ffc
Fix shifty legacy mode
papandreou May 29, 2022
553182f
fix
papandreou May 29, 2022
13996cf
Hacketyfix
papandreou May 30, 2022
6c72280
fix
papandreou May 30, 2022
638162c
Unhack
papandreou May 30, 2022
060a56e
simplify
papandreou May 30, 2022
f96b386
Clean
papandreou May 31, 2022
834abfe
simplify
papandreou May 31, 2022
a3b3ee0
clean
papandreou May 31, 2022
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
Prev Previous commit
Next Next commit
Unhack
  • Loading branch information
@papandreou
papandreou committed May 31, 2022
commit 638162c663c0d54905d15ffda31c43667af599f9
87 changes: 41 additions & 46 deletions lib/createTopLevelExpect.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1461,15 +1461,14 @@ expectPrototype._createWrappedExpect = function (
for (let i = 2; i < arguments.length; i += 1) {
args[i - 2] = arguments[i];
}
return wrappedExpect._callInNestedContext(
() =>
parentExpect._executeExpect(
context.child(),
subject,
testDescriptionString,
args,
wrappedExpect.flags
).result
return wrappedExpect._callInNestedContext(() =>
parentExpect._executeExpect(
context.child(),
subject,
testDescriptionString,
args,
wrappedExpect.flags
)
);
}

Expand Down Expand Up @@ -1573,20 +1572,39 @@ expectPrototype._executeExpect = function (
);

if (assertionRule.expect && assertionRule.expect !== this._topLevelExpect) {
return {
result: assertionRule.expect._expect(context, [
subject,
testDescriptionString,
...args,
]),
wrappedExpect,
};
return assertionRule.expect._expect(context, [
subject,
testDescriptionString,
...args,
]);
}

return {
result: oathbreaker(assertionRule.handler(wrappedExpect, subject, ...args)),
wrappedExpect,
};
let result = oathbreaker(
assertionRule.handler(wrappedExpect, subject, ...args)
);

if (utils.isPromise(result)) {
result = wrapPromiseIfNecessary(result);
if (result.isPending()) {
result = result.then(undefined, (e) => {
if (e && e._isUnexpected && context.level === 0) {
this.setErrorMessage(e);
}
throw e;
});
this.notifyPendingPromise(result);
}
} else {
result = makePromise.resolve(result);
}
// Her mangler vi wrappedExpect?
return wrappedExpect.addAdditionalPromiseMethods(
result,
this,
subject,
Array.prototype.slice.call(args, 0, 2),
wrappedExpect
);
};

expectPrototype._camelCaser = function (context, subjectType, subject) {
Expand Down Expand Up @@ -1644,34 +1662,13 @@ expectPrototype._expect = function (context, args, forwardedFlags) {
}

try {
let { result, wrappedExpect } = this._executeExpect(
return this._executeExpect(
context,
subject,
testDescriptionString,
Array.prototype.slice.call(args, 2),
forwardedFlags
);
if (utils.isPromise(result)) {
result = wrapPromiseIfNecessary(result);
if (result.isPending()) {
result = result.then(undefined, (e) => {
if (e && e._isUnexpected && context.level === 0) {
this.setErrorMessage(e);
}
throw e;
});
this.notifyPendingPromise(result);
}
} else {
result = makePromise.resolve(result);
}
return wrappedExpect.addAdditionalPromiseMethods(
result,
this,
subject,
Array.prototype.slice.call(args, 0, 2),
wrappedExpect
);
} catch (e) {
if (e && e._isUnexpected) {
let newError = e;
Expand Down Expand Up @@ -1951,8 +1948,6 @@ expectPrototype._callInNestedContext = function (callback) {
};

expectPrototype.shifty = function (subject, args, rest, legacyMode) {
this._assertWrappedExpect();

const nextArgumentType = this.findTypeOf(rest[0]);
if (legacyMode) {
// Legacy
Expand Down Expand Up @@ -1991,7 +1986,7 @@ expectPrototype.shifty = function (subject, args, rest, legacyMode) {
}
);
} else if (nextArgumentType.is('string')) {
return this.execute(subject, ...rest);
return this(subject, ...rest);
} else {
return subject;
}
Expand Down