Skip to content

Allowed named classes and functions as BlockNames #5154

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

Merged
cpojer merged 13 commits into from
Dec 24, 2017
Merged

Allowed named classes and functions as BlockNames #5154

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
2ec0c8b
Allowed named classes and functions as BlockNames
Dec 21, 2017
79a11aa
Added integration test for describe with a class or function
Dec 23, 2017
b335f41
Corrected globals.test.js.snap
Dec 24, 2017
db2fc7d
Mentioned changes in CHANGELOG.md
Dec 24, 2017
0bae63c
Master!
Dec 24, 2017
67dcfe6
Merge branch 'master' into describe-function-and-class-names
Dec 24, 2017
8cd8505
Added failure for non-string/class/function
Dec 24, 2017
74ca575
I am become pretty
Dec 24, 2017
c4b8343
Fixed failure message for globals.test.js.snap
Dec 24, 2017
e1f6c7f
Removed error test case for array-as-descriptor
Dec 24, 2017
9c6b2c5
Removed error test for array-as-descriptor
Dec 24, 2017
0744cf9
Added allowance for numbers as test descriptors
Dec 24, 2017
e547ef4
Prettier...
Dec 24, 2017
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
Merge branch 'master' into describe-function-and-class-names 
# Conflicts:
#	CHANGELOG.md
  • Loading branch information
Josh Goldberg committed Dec 24, 2017
commit 67dcfe6c919484e4007c155886c971e9d5e313aa
4 changes: 3 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@
### Features

* `[jest-jasmine]` Allowed classes and functions as `describe` names
([#5154](https://github.com/facebook/jest/pull/5154))
([#5154](https://github.com/facebook/jest/pull/5154))
* `[jest-jasmine2]` Support generator functions as specs.
([#5166](https://github.com/facebook/jest/pull/5166))

### Chore & Maintenance

Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.