Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 21:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update web-platform-tests to revision dc60bfc45b49e3a5e653320e65b0fd447676b836

Browse source
This commit is contained in:
WPT Sync Bot 2018-06-04 21:06:39 -04:00
parent 652a177ff5
commit 0bc549be55
690 changed files with 6588 additions and 1564 deletions
Download patch file Download diff file Expand all files Collapse all files

49
tests/wpt/web-platform-tests/docs/_appendix/github-intro.md
View file

@ -43,14 +43,7 @@ If you are a first-time GitHub user, read on for more details of the workflow.
time you talk to the remote server, you'll need to set up password caching.
See [Caching your GitHub password in Git][password-caching].
## Test Repositories
The test repository that you contribute to will depend on the specification
that you are testing.
**Main W3C test repository**: [github.com/web-platform-tests/wpt][main-repo]
## Fork
## Fork the test repository
Now that you have Git set up, you will need to fork the test repository. This
will enable you to [submit][submit] your tests using a pull request (more on this
@ -61,9 +54,9 @@ will enable you to [submit][submit] your tests using a pull request (more on thi
2. Click the ![fork][forkbtn] button in the upper right.
3. The fork will take several seconds, then you will be redirected to your
GitHub page for this forked repository. If you forked the HTML test repo
(for example), you will now be at
**https://github.com/username/web-platform-tests**.
GitHub page for this forked repository.
You will now be at
**https://github.com/username/wpt**.
4. After the fork is complete, you're ready to [clone](#clone).
@ -74,27 +67,15 @@ If your [fork](#fork) was successful, the next step is to clone (download a copy
### Clone the test repo
At the command prompt, cd into the directory where you want to keep the tests.
$ git clone --recursive https://github.com/username/web-platform-tests.git
$ git clone https://github.com/username/wpt.git
_This will download the tests into a directory named for the repo:_ `web-platform-tests/`.
_This will download the tests into a directory named for the repo:_ `wpt/`.
* You should now have a full copy of the test repository on your local
machine. Feel free to browse the directories on your hard drive. You can also
browse them on [github.com][github-w3c] and see the full history of contributions
there.
### Clone the submodules
* If you cloned the test repo and used the `--recursive` option, you'll find its submodules in `[repo-root]/resources/`.
* If you cloned the the test repo and did not use the `--recursive` option, you will likely have an empty `resources` directory at the root of your cloned repo. You can clone the submodules with these additional steps:
$ cd web-platform-tests
$ git submodule update --init --recursive
_You should now see the submodules in the repository. For example,_ `testharness` _files in should be in the resources directory._
## Configure Remote / Upstream
Synchronizing your forked repository with the W3C repository will enable you to
keep your forked local copy up-to-date with the latest commits in the W3C
@ -209,24 +190,23 @@ them back up to the server:
2. Now you can send a message that you have changes or additions you'd like
to be reviewed and merged into the main (original) test repository. You do
this by using a pull request. In a browser, open the GitHub page for your
forked repository: **https://github.com/username/web-platform-tests**.
forked repository: **https://github.com/username/wpt**.
3. Now create the pull request. There are several ways to create a PR in the
GitHub UI. Below is one method and others can be found on
[GitHub.com][github-createpr]
1. Click the ![pull request link][pullrequestlink] link on the right side
of the UI, then click the ![new pull request][pullrequestbtn] button.
1. Click the ![new pull request][pullrequestbtn] button.
2. On the left, you should see the base repo is the
web-platform-tests/wpt. On the right, you should see your fork of that
repo. In the branch menu of your forked repo, switch to `topic`
**Note:** If you see _'There isn't anything to compare'_, click
the ![edit][editbtn] button and make sure your fork and your `topic`
**Note:** If you see _'There isn't anything to compare'_,
make sure your fork and your `topic`
branch is selected on the right side.
3. Select the ![create pull request][createprlink] link at the top.
3. Select the ![create pull request][createpr] button at the top.
4. Scroll down and review the diff
@ -238,7 +218,7 @@ GitHub UI. Below is one method and others can be found on
6. If you'd like to add more detailed comments, use the comment field
below.
7. Click ![the send pull request button][sendpullrequest]
7. Click ![the create pull request button][createpr]
4. Wait for feedback on your pull request and once your pull request is
@ -395,11 +375,8 @@ you may also discard your connection to their repo:
[help]: https://help.github.com/
[main-repo]: https://github.com/web-platform-tests/wpt
[password-caching]: https://help.github.com/articles/caching-your-github-password-in-git
[pullrequestlink]: {{ site.baseurl }}{% link /assets/pullrequestlink.png %}
[pullrequestbtn]: {{ site.baseurl }}{% link /assets/pullrequestbtn.png %}
[editbtn]: {{ site.baseurl }}{% link /assets/editbtn.png %}
[createprlink]: {{ site.baseurl }}{% link /assets/createprlink.png %}
[sendpullrequest]: {{ site.baseurl }}{% link /assets/sendpullrequest.png %}
[createpr]: {{ site.baseurl }}{% link /assets/createpr.png %}
[praccepteddelete]: {{ site.baseurl }}{% link /assets/praccepteddelete.png %}
[submit]: #submit
[remote-upstream]: #configure-remote-upstream