Skip to content

Commit

Permalink
fixes babel core error as reported in issue kentcdodds#79 (kentcdodds#82
Browse files Browse the repository at this point in the history
)

* fix snapshots I guess.

* fix: snapshots

* fixes babel core error as reported in issue kentcdodds#79 by installing babel-preset-react-app dev dependency

* fixes issue79

* fix setup
  • Loading branch information
weiklr authored and Kent C. Dodds committed Jun 26, 2018
1 parent 7ce34b9 commit b2de80a
Show file tree
Hide file tree
Showing 7 changed files with 165 additions and 110 deletions.
9 changes: 9 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,15 @@
"contributions": [
"doc"
]
},
{
"login": "wk32",
"name": "WK",
"avatar_url": "https://avatars3.githubusercontent.com/u/7888225?v=4",
"profile": "https://github.com/wk32",
"contributions": [
"bug"
]
}
],
"repoType": "github"
Expand Down
44 changes: 21 additions & 23 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ workshop repo to teach you about testing JavaScript applications.
[![AppVeyor Build Status][win-build-badge]][win-build]
[![Code Coverage][coverage-badge]][coverage]
[![License][license-badge]](#license)
[![All Contributors](https://img.shields.io/badge/all_contributors-7-orange.svg?style=flat-square)](#contributors)
[![All Contributors](https://img.shields.io/badge/all_contributors-8-orange.svg?style=flat-square)](#contributors)

[![PRs Welcome][prs-badge]][prs]
[![Code of Conduct][coc-badge]][coc]
Expand All @@ -26,24 +26,22 @@ workshop repo to teach you about testing JavaScript applications.
## Table of Contents

<!-- START doctoc generated TOC please keep comment here to allow auto update -->

<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->

<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->

* [Topics covered](#topics-covered)
* [Branches](#branches)
* [System Requirements](#system-requirements)
* [Setup](#setup)
* [Running the app](#running-the-app)
* [About the app](#about-the-app)
* [Continuous Integration](#continuous-integration)
* [Hosting](#hosting)
* [Register and Login](#register-and-login)
* [Troubleshooting](#troubleshooting)
* [Structure](#structure)
* [Contributors](#contributors)
* [LICENSE](#license)
- [Topics covered](#topics-covered)
- [Branches](#branches)
- [System Requirements](#system-requirements)
- [Setup](#setup)
- [Running the app](#running-the-app)
- [About the app](#about-the-app)
- [Continuous Integration](#continuous-integration)
- [Hosting](#hosting)
- [Register and Login](#register-and-login)
- [Troubleshooting](#troubleshooting)
- [Structure](#structure)
- [Contributors](#contributors)
- [LICENSE](#license)

<!-- END doctoc generated TOC please keep comment here to allow auto update -->

Expand Down Expand Up @@ -71,13 +69,13 @@ want to switch to the appropriate branch for this workshop. Otherwise the code
you're looking at may not be exactly the same as the code used in the setting
you're working with.

* Frontend Masters 2017 [`fem`](https://github.com/kentcdodds/testing-workshop/tree/fem)
- Frontend Masters 2017 [`fem`](https://github.com/kentcdodds/testing-workshop/tree/fem)

## System Requirements

* [git][git] v2.14.1 or greater
* [NodeJS][node] v8.9.4 or greater
* [npm][npm] v5.6.0 or greater
- [git][git] v2.14.1 or greater
- [NodeJS][node] v8.9.4 or greater
- [npm][npm] v5.6.0 or greater

All of these must be available in your `PATH`. To verify things are set up
properly, you can run this:
Expand Down Expand Up @@ -146,8 +144,8 @@ generated).

We're using two CI services:

* [Travis][build] (Linux): find config in `.travis.yml`
* [AppVeyor][win-build] (Windows): find config in `appveyor.yml`
- [Travis][build] (Linux): find config in `.travis.yml`
- [AppVeyor][win-build] (Windows): find config in `appveyor.yml`

### Hosting

Expand Down Expand Up @@ -270,10 +268,10 @@ able to leave you command line in the root directory for the whole workshop.
Thanks goes to these wonderful people ([emoji key](https://github.com/kentcdodds/all-contributors#emoji-key)):

<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->

<!-- prettier-ignore -->
| [<img src="https://avatars.githubusercontent.com/u/1500684?v=3" width="100px;"/><br /><sub><b>Kent C. Dodds</b></sub>](https://kentcdodds.com)<br />[💻](https://github.com/kentcdodds/testing-workshop/commits?author=kentcdodds "Code") [📖](https://github.com/kentcdodds/testing-workshop/commits?author=kentcdodds "Documentation") [🚇](#infra-kentcdodds "Infrastructure (Hosting, Build-Tools, etc)") [⚠️](https://github.com/kentcdodds/testing-workshop/commits?author=kentcdodds "Tests") | [<img src="https://avatars3.githubusercontent.com/u/13832392?v=4" width="100px;"/><br /><sub><b>Osama Jandali</b></sub>](https://github.com/osamajandali)<br />[💻](https://github.com/kentcdodds/testing-workshop/commits?author=osamajandali "Code") [🎨](#design-osamajandali "Design") | [<img src="https://avatars2.githubusercontent.com/u/3818515?v=4" width="100px;"/><br /><sub><b>Stefan Ivic</b></sub>](http://stefanivic.me/)<br />[🐛](https://github.com/kentcdodds/testing-workshop/issues?q=author%3Astefanivic "Bug reports") | [<img src="https://avatars2.githubusercontent.com/u/2413413?v=4" width="100px;"/><br /><sub><b>Nick Klepinger</b></sub>](https://github.com/bodiddlie)<br />[🐛](https://github.com/kentcdodds/testing-workshop/issues?q=author%3Abodiddlie "Bug reports") | [<img src="https://avatars2.githubusercontent.com/u/6417910?v=4" width="100px;"/><br /><sub><b>Abinav Seelan</b></sub>](http://abinavseelan.com)<br />[🐛](https://github.com/kentcdodds/testing-workshop/issues?q=author%3Aabinavseelan "Bug reports") | [<img src="https://avatars0.githubusercontent.com/u/2751691?v=4" width="100px;"/><br /><sub><b>Philip Sotirov</b></sub>](http://philipsotirov.com)<br />[🐛](https://github.com/kentcdodds/testing-workshop/issues?q=author%3Afipo "Bug reports") | [<img src="https://avatars3.githubusercontent.com/u/3409645?v=4" width="100px;"/><br /><sub><b>Austin Wood</b></sub>](https://github.com/indiesquidge)<br />[📖](https://github.com/kentcdodds/testing-workshop/commits?author=indiesquidge "Documentation") |
| :---: | :---: | :---: | :---: | :---: | :---: | :---: |
| [<img src="https://avatars3.githubusercontent.com/u/7888225?v=4" width="100px;"/><br /><sub><b>WK</b></sub>](https://github.com/wk32)<br />[🐛](https://github.com/kentcdodds/testing-workshop/issues?q=author%3Awk32 "Bug reports") |

<!-- ALL-CONTRIBUTORS-LIST:END -->

Expand Down
2 changes: 1 addition & 1 deletion client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"devDependencies": {
"jest-dom": "^1.0.0",
"jest-glamor-react": "^4.2.0",
"react-scripts": "2.0.0-next.b2fd8db8",
"react-scripts": "^1.1.4",
"react-testing-library": "^2.1.1",
"til-shared": "file:../shared"
},
Expand Down
64 changes: 40 additions & 24 deletions client/src/components/__tests__/__snapshots__/login.final.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,22 @@
exports[`snapshot 1`] = `
.css-0,
[data-css-0] {
display: -webkit-box;
display: -moz-box;
display: -ms-flexbox;
display: -webkit-flex;
display: flex;
flex-direction: column;
align-items: center;
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-webkit-flex-direction: column;
-webkit-box-align: center;
-webkit-align-items: center;
}
.css-1,
[data-css-1] {
display: -webkit-box;
display: -moz-box;
display: -ms-flexbox;
Expand All @@ -21,8 +37,8 @@ exports[`snapshot 1`] = `
-webkit-align-items: center;
}
.css-1,
[data-css-1] {
.css-2,
[data-css-2] {
display: grid;
grid-template-columns: 100px 1fr;
grid-gap: 16px;
Expand All @@ -37,8 +53,8 @@ exports[`snapshot 1`] = `
-webkit-align-items: center;
}
.css-2,
[data-css-2] {
.css-3,
[data-css-3] {
background: white;
height: 50px;
border: none;
Expand All @@ -51,28 +67,28 @@ exports[`snapshot 1`] = `
padding-left: 10px;
}
.css-2::-webkit-input-placeholder,
[data-css-2]::-webkit-input-placeholder {
.css-3::-webkit-input-placeholder,
[data-css-3]::-webkit-input-placeholder {
opacity: 0.5;
}
.css-2::-moz-placeholder,
[data-css-2]::-moz-placeholder {
.css-3::-moz-placeholder,
[data-css-3]::-moz-placeholder {
opacity: 0.5;
}
.css-2::-ms-input-placeholder,
[data-css-2]::-ms-input-placeholder {
.css-3::-ms-input-placeholder,
[data-css-3]::-ms-input-placeholder {
opacity: 0.5;
}
.css-2::placeholder,
[data-css-2]::placeholder {
.css-3::placeholder,
[data-css-3]::placeholder {
opacity: 0.5;
}
.css-7,
[data-css-7] {
.css-8,
[data-css-8] {
font-size: 13px;
font-family: Raleway,sans-serif;
background: var(--green);
Expand All @@ -89,36 +105,36 @@ exports[`snapshot 1`] = `
-moz-transition: 0.5s;
}
.css-7:hover,
[data-css-7]:hover {
.css-8:hover,
[data-css-8]:hover {
box-shadow: var(--shadowHover);
}
@media only screen and (max-width: 819px) {
.css-0,
[data-css-0] {
.css-1,
[data-css-1] {
margin-left: 0;
width: 90%;
}
}
<div>
<div
style="display: flex;"
class="css-0"
>
<form
class="css-0"
class="css-1"
>
<div
class="css-1"
class="css-2"
>
<label
for="username-input"
>
Username
</label>
<input
class="css-2"
class="css-3"
id="username-input"
name="username"
placeholder="Username..."
Expand All @@ -130,14 +146,14 @@ exports[`snapshot 1`] = `
</label>
<input
aria-labelledby="password-input"
class="css-2"
class="css-3"
name="password"
placeholder="Password..."
type="password"
/>
</div>
<button
class="css-7"
class="css-8"
type="submit"
>
Submit
Expand Down
Loading

0 comments on commit b2de80a

Please sign in to comment.