Skip to content

Commit

Permalink
Merge pull request #3 from Raathigesh/master
Browse files Browse the repository at this point in the history
sync with official fork v1.7.0
  • Loading branch information
gregveres committed May 15, 2020
2 parents 487b6fd + 22e6de2 commit 2296cf6
Show file tree
Hide file tree
Showing 14 changed files with 11,184 additions and 15 deletions.
20 changes: 20 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,26 @@
"contributions": [
"infra"
]
},
{
"login": "gregveres",
"name": "gregveres",
"avatar_url": "https://avatars2.githubusercontent.com/u/12899823?v=4",
"profile": "https://github.com/gregveres",
"contributions": [
"bug",
"code"
]
},
{
"login": "adamkleingit",
"name": "adam klein",
"avatar_url": "https://avatars3.githubusercontent.com/u/889418?v=4",
"profile": "http://adamklein.dev",
"contributions": [
"test",
"code"
]
}
],
"contributorsPerLine": 7,
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,8 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
<tr>
<td align="center"><a href="http://rahulakrishna.github.io"><img src="https://avatars2.githubusercontent.com/u/10240002?v=4" width="100px;" alt=""/><br /><sub><b>Rahul A. Krishna</b></sub></a><br /><a href="https://github.com/Raathigesh/majestic/commits?author=rahulakrishna" title="Code">💻</a> <a href="#ideas-rahulakrishna" title="Ideas, Planning, & Feedback">🤔</a> <a href="#tool-rahulakrishna" title="Tools">🔧</a></td>
<td align="center"><a href="https://amilajack.com"><img src="https://avatars1.githubusercontent.com/u/6374832?v=4" width="100px;" alt=""/><br /><sub><b>Amila Welihinda</b></sub></a><br /><a href="#infra-amilajack" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
<td align="center"><a href="https://github.com/gregveres"><img src="https://avatars2.githubusercontent.com/u/12899823?v=4" width="100px;" alt=""/><br /><sub><b>gregveres</b></sub></a><br /><a href="https://github.com/Raathigesh/majestic/issues?q=author%3Agregveres" title="Bug reports">🐛</a> <a href="https://github.com/Raathigesh/majestic/commits?author=gregveres" title="Code">💻</a></td>
<td align="center"><a href="http://adamklein.dev"><img src="https://avatars3.githubusercontent.com/u/889418?v=4" width="100px;" alt=""/><br /><sub><b>adam klein</b></sub></a><br /><a href="https://github.com/Raathigesh/majestic/commits?author=adamkleingit" title="Tests">⚠️</a> <a href="https://github.com/Raathigesh/majestic/commits?author=adamkleingit" title="Code">💻</a></td>
</tr>
</table>

Expand Down
9 changes: 9 additions & 0 deletions integration/cypress/integration/basic/basic-functionality.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,13 @@ context("basic", () => {
cy.wait(5000);
cy.queryByText("Update Snapshot").should("exist");
});

it("should not show update snapshot button", () => {
cy.wait(2000);
cy.getByText("test-snapshot-text.spec.js").click({ force: true });
cy.wait(2000);
cy.getByText("Run").click();
cy.wait(5000);
cy.queryByText("Update Snapshot").should("not.exist");
});
});
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`test snapshot test 1`] = `
exports[`test Snapsh0t test 1`] = `
<div
className="App"
>
Expand Down
Loading

0 comments on commit 2296cf6

Please sign in to comment.