Skip to content
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 jasmine dependency from jest-matchers #2389

Merged
merged 1 commit into from
Dec 20, 2016

Conversation

vjeux
Copy link
Contributor

@vjeux vjeux commented Dec 20, 2016

I brought equals from the checked in version of jasmine ( https://github.com/facebook/jest/blob/db0f3b4902ddb360020be8f737db1fae7a8508c4/packages/jest-jasmine2/vendor/jasmine-2.5.2.js#L2787-L3048 )

I did a few tweaks:

  • Imported isUndefined, isA and isDomNode
  • Moved all the functions that were defined inside of functions to the global "namespace"
  • Disabled lint and flow

@vjeux vjeux requested a review from cpojer December 20, 2016 22:01
@@ -0,0 +1,239 @@
/**
* Copyright (c) 2014, Facebook, Inc. All rights reserved.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should it be jasmine's copyright though?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whoops, changed to jasmine copyright

@aaronabramov
Copy link
Contributor

❤️

I brought equals from the checked in version of jasmine ( https://github.com/facebook/jest/blob/db0f3b4902ddb360020be8f737db1fae7a8508c4/packages/jest-jasmine2/vendor/jasmine-2.5.2.js#L2787-L3048 )

I did a few tweaks:
- Imported isUndefined, isA and isDomNode
- Moved all the functions that were defined inside of functions to the global "namespace"
- Disabled lint and flow
@cpojer cpojer merged commit df2bb09 into jestjs:master Dec 20, 2016
vjeux added a commit to vjeux/jest that referenced this pull request Dec 20, 2016
In jestjs#2389 I moved equals but it turns out there are more!

I renamed the file `expect.js` to `jasmine-utils` and moved it to `jest-matchers` instead of `jest-matcher-utils`.

This is the big thing, otherwise it's been pretty much copy and pasted from jasmine.
vjeux added a commit to vjeux/jest that referenced this pull request Dec 20, 2016
In jestjs#2389 I moved equals but it turns out there are more!

I renamed the file `expect.js` to `jasmine-utils` and moved it to `jest-matchers` instead of `jest-matcher-utils`.

This is the big thing, otherwise it's been pretty much copy and pasted from jasmine.
vjeux added a commit to vjeux/jest that referenced this pull request Dec 20, 2016
In jestjs#2389 I moved equals but it turns out there are more!

I renamed the file `expect.js` to `jasmine-utils` and moved it to `jest-matchers` instead of `jest-matcher-utils`.

This is the big thing, otherwise it's been pretty much copy and pasted from jasmine.
cpojer pushed a commit that referenced this pull request Dec 21, 2016
In #2389 I moved equals but it turns out there are more!

I renamed the file `expect.js` to `jasmine-utils` and moved it to `jest-matchers` instead of `jest-matcher-utils`.

This is the big thing, otherwise it's been pretty much copy and pasted from jasmine.
aaronabramov pushed a commit to aaronabramov/jest that referenced this pull request Dec 22, 2016
I brought equals from the checked in version of jasmine ( https://github.com/facebook/jest/blob/db0f3b4902ddb360020be8f737db1fae7a8508c4/packages/jest-jasmine2/vendor/jasmine-2.5.2.js#L2787-L3048 )

I did a few tweaks:
- Imported isUndefined, isA and isDomNode
- Moved all the functions that were defined inside of functions to the global "namespace"
- Disabled lint and flow
aaronabramov pushed a commit to aaronabramov/jest that referenced this pull request Dec 22, 2016
In jestjs#2389 I moved equals but it turns out there are more!

I renamed the file `expect.js` to `jasmine-utils` and moved it to `jest-matchers` instead of `jest-matcher-utils`.

This is the big thing, otherwise it's been pretty much copy and pasted from jasmine.
skovhus pushed a commit to skovhus/jest that referenced this pull request Apr 29, 2017
I brought equals from the checked in version of jasmine ( https://github.com/facebook/jest/blob/db0f3b4902ddb360020be8f737db1fae7a8508c4/packages/jest-jasmine2/vendor/jasmine-2.5.2.js#L2787-L3048 )

I did a few tweaks:
- Imported isUndefined, isA and isDomNode
- Moved all the functions that were defined inside of functions to the global "namespace"
- Disabled lint and flow
skovhus pushed a commit to skovhus/jest that referenced this pull request Apr 29, 2017
In jestjs#2389 I moved equals but it turns out there are more!

I renamed the file `expect.js` to `jasmine-utils` and moved it to `jest-matchers` instead of `jest-matcher-utils`.

This is the big thing, otherwise it's been pretty much copy and pasted from jasmine.
tushardhole pushed a commit to tushardhole/jest that referenced this pull request Aug 21, 2017
I brought equals from the checked in version of jasmine ( https://github.com/facebook/jest/blob/db0f3b4902ddb360020be8f737db1fae7a8508c4/packages/jest-jasmine2/vendor/jasmine-2.5.2.js#L2787-L3048 )

I did a few tweaks:
- Imported isUndefined, isA and isDomNode
- Moved all the functions that were defined inside of functions to the global "namespace"
- Disabled lint and flow
tushardhole pushed a commit to tushardhole/jest that referenced this pull request Aug 21, 2017
In jestjs#2389 I moved equals but it turns out there are more!

I renamed the file `expect.js` to `jasmine-utils` and moved it to `jest-matchers` instead of `jest-matcher-utils`.

This is the big thing, otherwise it's been pretty much copy and pasted from jasmine.
@github-actions
Copy link

This pull request has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.
Please note this issue tracker is not a help forum. We recommend using StackOverflow or our discord channel for questions.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators May 14, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants