Skip to content

Commit

Permalink
Bump jest-html
Browse files Browse the repository at this point in the history
  • Loading branch information
@guigrpa
guigrpa committed Nov 8, 2016
1 parent adf555c commit 500dcc1
Show file tree
Hide file tree
Showing 9 changed files with 657 additions and 706 deletions.
2 changes: 1 addition & 1 deletion package.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ const specs = {

// Testing with Jest
'jest': '16.1.0-alpha.691b0e22',
'jest-html': '^1.1.0',
'jest-html': '^1.2.0',
'react-test-renderer': '15.3.2',
'babel-jest': '16.0.0',

Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
"ignore-styles": "4.0.0",
"isomorphic-fetch": "2.2.1",
"jest": "16.1.0-alpha.691b0e22",
"jest-html": "^1.1.0",
"jest-html": "^1.2.0",
"json-loader": "0.5.4",
"mocha": "2.4.5",
"moment": "2.14.1",
Expand Down
97 changes: 50 additions & 47 deletions testJest/chromeExtension/components/__snapshots__/005-app.test.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,35 +96,33 @@ exports[`App renders correctly when connected 1`] = `
</div>
</div>
------------HTML PREVIEW---------------
<div
id="appRoot"
style="background-color:white;color:rgb(64, 64, 64);height:100%;"
>
<div
id="appRoot"
style="background-color:white;color:rgb(64, 64, 64);height:100%;">
<div
class="giu-floats"
style="height:0;left:0;position:absolute;top:0;width:0;">
</div>
<div
class="giu-notifications"
style="bottom:20px;max-width:350px;position:fixed;right:20px;z-index:9000;">
</div>
<div
dataMockType="Toolbar">
<div
style="color:blue;font-weight:bold;">
Toolbar
</div>
class="giu-floats"
style="height:0;left:0;position:absolute;top:0;width:0;"
>
</div>
<div
class="giu-notifications"
style="bottom:20px;max-width:350px;position:fixed;right:20px;z-index:9000;"
>
</div>
<div dataMockType="Toolbar">
<div style="color:blue;font-weight:bold;">
Toolbar
</div>
<div
style="padding:4px;">
<div
dataMockType="Story">
<div
style="color:blue;font-weight:bold;">
Story
</div>
</div>
<div style="padding:4px;">
<div dataMockType="Story">
<div style="color:blue;font-weight:bold;">
Story
</div>
</div>
</div>
</div>
`;

exports[`App renders correctly when disconnected 1`] = `
Expand Down Expand Up @@ -189,31 +187,36 @@ exports[`App renders correctly when disconnected 1`] = `
</div>
</div>
------------HTML PREVIEW---------------
<div
id="appRoot"
style="background-color:white;color:rgb(64, 64, 64);height:100%;"
>
<div
id="appRoot"
style="background-color:white;color:rgb(64, 64, 64);height:100%;">
<div
class="giu-floats"
style="height:0;left:0;position:absolute;top:0;width:0;">
</div>
<div
class="giu-notifications"
style="bottom:20px;max-width:350px;position:fixed;right:20px;z-index:9000;">
class="giu-floats"
style="height:0;left:0;position:absolute;top:0;width:0;"
>
</div>
<div
class="giu-notifications"
style="bottom:20px;max-width:350px;position:fixed;right:20px;z-index:9000;"
>
</div>
<div
class="giu-large-message"
style="color:rgb(115, 115, 115);font-size:1.4em;font-weight:700;padding:0.8em;text-align:center;"
>
<div>
<i
class="giu-icon fa fa-circle-o-notch fa-spin"
style="cursor:pointer;letter-spacing:normal;"
>
</i>
Connecting to Storyboard...
</div>
<div
class="giu-large-message"
style="color:rgb(115, 115, 115);font-size:1.4em;font-weight:700;padding:0.8em;text-align:center;">
<div>
<i
class="giu-icon fa fa-circle-o-notch fa-spin"
style="cursor:pointer;letter-spacing:normal;">
</i>
Connecting to Storyboard...
</div>
<div>
Navigate to your Storyboard-equipped app (and log in if required)
</div>
<div>
Navigate to your Storyboard-equipped app (and log in if required)
</div>
</div>
</div>
`;
175 changes: 90 additions & 85 deletions testJest/chromeExtension/components/__snapshots__/010-login.test.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,16 @@ exports[`Login renders correctly when LOGGED_IN 1`] = `
title="Log out" />
</div>
------------HTML PREVIEW---------------
<div
style="background-color:white;color:rgb(64, 64, 64);padding:4px 10px;">
Logged in as Guille
<i
class="giu-icon fa fa-sign-out fa-lg fa-fw"
style="cursor:pointer;letter-spacing:normal;"
title="Log out">
</i>
</div>
<div style="background-color:white;color:rgb(64, 64, 64);padding:4px 10px;">
Logged in as Guille
<i
class="giu-icon fa fa-sign-out fa-lg fa-fw"
style="cursor:pointer;letter-spacing:normal;"
title="Log out"
>
</i>
</div>
`;

exports[`Login renders correctly when LOGGED_OUT 1`] = `
Expand Down Expand Up @@ -127,38 +127,41 @@ exports[`Login renders correctly when LOGGED_OUT 1`] = `
</div>
</div>
------------HTML PREVIEW---------------
<div>
<div
class="giu-floats"
style="height:0;left:0;position:absolute;top:0;width:0;">
</div>
<div
style="background-color:rgb(214, 236, 255);color:black;padding:4px 10px;">
<b>
Server logs:
</b>
<input
class="giu-text-input"
id="login"
placeholder="Login"
style="background-color:transparent;border:1px solid #999999;color:inherit;font-family:inherit;font-size:inherit;font-weight:inherit;margin-right:4px;width:70px;"
type="text"
value="">
<input
class="giu-password-input"
id="password"
placeholder="Password"
style="background-color:transparent;border:1px solid #999999;color:inherit;font-family:inherit;font-size:inherit;font-weight:inherit;margin-right:4px;width:70px;"
type="password"
value="">
<i
class="giu-icon fa fa-sign-in fa-lg fa-fw"
style="cursor:pointer;letter-spacing:normal;"
title="Log in">
</i>
</div>
<div>
<div
class="giu-floats"
style="height:0;left:0;position:absolute;top:0;width:0;"
>
</div>
<div style="background-color:rgb(214, 236, 255);color:black;padding:4px 10px;">
<b>
Server logs:
</b>
<input
class="giu-text-input"
id="login"
placeholder="Login"
style="background-color:transparent;border:1px solid #999999;color:inherit;font-family:inherit;font-size:inherit;font-weight:inherit;margin-right:4px;width:70px;"
type="text"
value=""
>
<input
class="giu-password-input"
id="password"
placeholder="Password"
style="background-color:transparent;border:1px solid #999999;color:inherit;font-family:inherit;font-size:inherit;font-weight:inherit;margin-right:4px;width:70px;"
type="password"
value=""
>
<i
class="giu-icon fa fa-sign-in fa-lg fa-fw"
style="cursor:pointer;letter-spacing:normal;"
title="Log in"
>
</i>
</div>
</div>
`;
exports[`Login renders correctly when LOGGING_IN 1`] = `
Expand Down Expand Up @@ -253,38 +256,41 @@ exports[`Login renders correctly when LOGGING_IN 1`] = `
</div>
</div>
------------HTML PREVIEW---------------
<div>
<div
class="giu-floats"
style="height:0;left:0;position:absolute;top:0;width:0;">
</div>
<div
style="background-color:rgb(214, 236, 255);color:black;padding:4px 10px;">
<b>
Server logs:
</b>
<input
class="giu-text-input"
id="login"
placeholder="Login"
style="background-color:transparent;border:1px solid #999999;color:inherit;font-family:inherit;font-size:inherit;font-weight:inherit;margin-right:4px;width:70px;"
type="text"
value="">
<input
class="giu-password-input"
id="password"
placeholder="Password"
style="background-color:transparent;border:1px solid #999999;color:inherit;font-family:inherit;font-size:inherit;font-weight:inherit;margin-right:4px;width:70px;"
type="password"
value="">
<i
class="giu-icon fa fa-circle-o-notch fa-lg fa-fw fa-spin"
style="cursor:pointer;letter-spacing:normal;"
title="Logging in">
</i>
</div>
<div>
<div
class="giu-floats"
style="height:0;left:0;position:absolute;top:0;width:0;"
>
</div>
<div style="background-color:rgb(214, 236, 255);color:black;padding:4px 10px;">
<b>
Server logs:
</b>
<input
class="giu-text-input"
id="login"
placeholder="Login"
style="background-color:transparent;border:1px solid #999999;color:inherit;font-family:inherit;font-size:inherit;font-weight:inherit;margin-right:4px;width:70px;"
type="text"
value=""
>
<input
class="giu-password-input"
id="password"
placeholder="Password"
style="background-color:transparent;border:1px solid #999999;color:inherit;font-family:inherit;font-size:inherit;font-weight:inherit;margin-right:4px;width:70px;"
type="password"
value=""
>
<i
class="giu-icon fa fa-circle-o-notch fa-lg fa-fw fa-spin"
style="cursor:pointer;letter-spacing:normal;"
title="Logging in"
>
</i>
</div>
</div>
`;
exports[`Login renders correctly when login needs are still unknown 1`] = `
Expand All @@ -307,13 +313,13 @@ exports[`Login renders correctly when login needs are still unknown 1`] = `
} />
</div>
------------HTML PREVIEW---------------
<div
style="background-color:white;color:rgb(64, 64, 64);padding:4px 10px;">
<i
class="giu-icon fa fa-circle-o-notch fa-lg fa-fw fa-spin"
style="cursor:pointer;letter-spacing:normal;">
</i>
</div>
<div style="background-color:white;color:rgb(64, 64, 64);padding:4px 10px;">
<i
class="giu-icon fa fa-circle-o-notch fa-lg fa-fw fa-spin"
style="cursor:pointer;letter-spacing:normal;"
>
</i>
</div>
`;
exports[`Login renders correctly when no login is required 1`] = `
Expand All @@ -330,10 +336,9 @@ exports[`Login renders correctly when no login is required 1`] = `
</i>
</div>
------------HTML PREVIEW---------------
<div
style="background-color:white;color:rgb(64, 64, 64);padding:4px 10px;">
<i>
No login required to see server logs
</i>
</div>
<div style="background-color:white;color:rgb(64, 64, 64);padding:4px 10px;">
<i>
No login required to see server logs
</i>
</div>
`;
Loading

0 comments on commit 500dcc1

Please sign in to comment.