Skip to content

Commit

Permalink
🃏 Change license from BSD+Patents to MIT.
Browse files Browse the repository at this point in the history
  • Loading branch information
cpojer committed Sep 26, 2017
1 parent f67476e commit 77744a2
Show file tree
Hide file tree
Showing 634 changed files with 1,385 additions and 2,015 deletions.
5 changes: 2 additions & 3 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
/**
* Copyright (c) 2016-present, Facebook, Inc. All rights reserved.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

const path = require('path');
Expand Down
10 changes: 5 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ The core team will be monitoring for pull requests. When we get one, we'll run s

1. Fork the repo and create your branch from `master`.
A guide on how to fork a repository: https://help.github.com/articles/fork-a-repo/

Open terminal (e.g. Terminal, iTerm, Git Bash or Git Shell) and type:
```sh
git clone https://github.com/<your_username>/jest
Expand All @@ -39,7 +39,7 @@ The core team will be monitoring for pull requests. When we get one, we'll run s
3. Run `yarn install`.
On Windows:
To install [Yarn](https://yarnpkg.com/en/docs/install#windows-tab) on Windows you may need to download either node.js or Chocolatey<br />

```sh
yarn install
```
Expand Down Expand Up @@ -72,8 +72,8 @@ The core team will be monitoring for pull requests. When we get one, we'll run s

#### Additional Workflow for any changes made to website or docs

If you are making changes to the website or documentation, test the website folder
and run the server to check if your changes are being displayed accurately.
If you are making changes to the website or documentation, test the website folder
and run the server to check if your changes are being displayed accurately.

1. Locate to the website directory and install any website specific dependencies
by typing in `yarn`. Following steps are to be followed
Expand Down Expand Up @@ -161,4 +161,4 @@ Facebook has a [bounty program](https://www.facebook.com/whitehat/) for the safe
## License
By contributing to Jest, you agree that your contributions will be licensed under its BSD license.
By contributing to Jest, you agree that your contributions will be licensed under its MIT license.
41 changes: 17 additions & 24 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,30 +1,23 @@
BSD License
MIT License

For Jest software

Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
Copyright (c) 2014-present, Facebook, Inc.

Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

* Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.

* Neither the name Facebook nor the names of its contributors may be used to
endorse or promote products derived from this software without specific
prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
33 changes: 0 additions & 33 deletions PATENTS

This file was deleted.

7 changes: 3 additions & 4 deletions eslint_import_resolver.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
/**
* Copyright (c) 2014, Facebook, Inc. All rights reserved.
* Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* Adapted from node resolver: https://github.com/benmosher/eslint-plugin-import/tree/master/resolvers/node
*
Expand Down
5 changes: 2 additions & 3 deletions examples/react-native/ios/jestrn/AppDelegate.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
* Copyright (c) 2015-present, Facebook, Inc.
* All rights reserved.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

#import <UIKit/UIKit.h>
Expand Down
5 changes: 2 additions & 3 deletions examples/react-native/ios/jestrn/AppDelegate.m
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
* Copyright (c) 2015-present, Facebook, Inc.
* All rights reserved.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

#import "AppDelegate.h"
Expand Down
5 changes: 2 additions & 3 deletions examples/react-native/ios/jestrn/main.m
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
* Copyright (c) 2015-present, Facebook, Inc.
* All rights reserved.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

#import <UIKit/UIKit.h>
Expand Down
5 changes: 2 additions & 3 deletions examples/react-native/ios/jestrnTests/jestrnTests.m
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
* Copyright (c) 2015-present, Facebook, Inc.
* All rights reserved.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

#import <UIKit/UIKit.h>
Expand Down
5 changes: 2 additions & 3 deletions fixtures/parser_tests.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
/**
* Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

const fixtures = __dirname;
Expand Down
5 changes: 2 additions & 3 deletions flow-typed/console.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
/**
* Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @flow
*/
Expand Down
5 changes: 2 additions & 3 deletions flow-typed/graceful-fs.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
/**
* Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @flow
*/
Expand Down
5 changes: 2 additions & 3 deletions flow-typed/resolve.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
/**
* Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @flow
*/
Expand Down
16 changes: 8 additions & 8 deletions integration_tests/__tests__/__snapshots__/console.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ exports[`console printing 1`] = `
"PASS __tests__/console.test.js
● Console
console.log __tests__/console.test.js:11
console.log __tests__/console.test.js:10
This is a log message.
console.info __tests__/console.test.js:13
console.info __tests__/console.test.js:12
This is an info message.
console.warn __tests__/console.test.js:15
console.warn __tests__/console.test.js:14
This is a warning message.
console.error __tests__/console.test.js:17
console.error __tests__/console.test.js:16
This is an error message.
Expand All @@ -27,16 +27,16 @@ Ran all test suites.
`;
exports[`console printing with --verbose 1`] = `
" console.log __tests__/console.test.js:11
" console.log __tests__/console.test.js:10
This is a log message.
console.info __tests__/console.test.js:13
console.info __tests__/console.test.js:12
This is an info message.
console.warn __tests__/console.test.js:15
console.warn __tests__/console.test.js:14
This is a warning message.
console.error __tests__/console.test.js:17
console.error __tests__/console.test.js:16
This is an error message.
"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ exports[`collects coverage only from specified files avoiding dependencies 1`] =
File | % Stmts | % Branch | % Funcs | % Lines |Uncovered Lines |
----------|----------|----------|----------|----------|----------------|
All files | 85.71 | 100 | 50 | 85.71 | |
sum.js | 85.71 | 100 | 50 | 85.71 | 13 |
sum.js | 85.71 | 100 | 50 | 85.71 | 12 |
----------|----------|----------|----------|----------|----------------|
"
`;
Expand All @@ -48,10 +48,10 @@ File | % Stmts | % Branch | % Funcs | % Lines
-------------------------------------|----------|----------|----------|----------|----------------|
All files | 56.52 | 0 | 50 | 56.52 | |
coverage_report | 41.18 | 0 | 25 | 41.18 | |
not-required-in-test-suite.js | 0 | 0 | 0 | 0 | 9,16,17,18,20 |
not-required-in-test-suite.js | 0 | 0 | 0 | 0 | 8,15,16,17,19 |
other-file.js | 100 | 100 | 100 | 100 | |
sum.js | 85.71 | 100 | 50 | 85.71 | 13 |
sum_dependency.js | 0 | 0 | 0 | 0 | 9,11,12,15 |
sum.js | 85.71 | 100 | 50 | 85.71 | 12 |
sum_dependency.js | 0 | 0 | 0 | 0 | 8,10,11,14 |
coverage_report/cached-duplicates/a | 100 | 100 | 100 | 100 | |
identical.js | 100 | 100 | 100 | 100 | |
coverage_report/cached-duplicates/b | 100 | 100 | 100 | 100 | |
Expand Down
Loading

0 comments on commit 77744a2

Please sign in to comment.