Skip to content

Develop #147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 22 commits into from
Oct 16, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
f82cb7f
Merge branch 'master' into develop
brian-mann Oct 15, 2017
00fc052
launches => launch
paolodm Oct 16, 2017
bfa34e9
Merge pull request #139 from paolodm/launching-browsers
Oct 16, 2017
b73e871
replace <record_key> with example key because '<' was not escaping pr…
jennifer-shehane Oct 16, 2017
5a17d44
fix issue where sidebar nav was not displaying on faq pages.
jennifer-shehane Oct 16, 2017
e8a39b4
update html div -> header
jennifer-shehane Oct 16, 2017
28d27c7
Add edit button to faq
jennifer-shehane Oct 16, 2017
58f3e7a
restructure blogs/talks/podcast pages to .yml sources
jennifer-shehane Oct 16, 2017
6951ed3
Update contributing doc on how to add talks/podcasts/examples
jennifer-shehane Oct 16, 2017
137e2a0
add another blog #28
jennifer-shehane Oct 16, 2017
e64e849
Merge pull request #140 from cypress-io/#128-record-key-hidden
Oct 16, 2017
cfb3fa0
bump cypress
jennifer-shehane Oct 16, 2017
66deeed
Add tests to ensure sidebar is displaying in mobile nav for each page.
jennifer-shehane Oct 16, 2017
05b27f2
Merge branch 'develop' into add-new-examples
Oct 16, 2017
ce684cb
Merge branch 'develop' into #138-faq-mobile-menu-bug
Oct 16, 2017
fb4400d
Merge pull request #143 from cypress-io/add-new-examples
Oct 16, 2017
8644147
Merge branch 'develop' into #138-faq-mobile-menu-bug
Oct 16, 2017
a6425eb
remove .onlys
jennifer-shehane Oct 16, 2017
af61cd7
fix typo in why-cypress close #144
jennifer-shehane Oct 16, 2017
3073735
Merge pull request #142 from cypress-io/#138-faq-mobile-menu-bug
Oct 16, 2017
dc4904b
Merge branch 'develop' into #144-typo-in-why
Oct 16, 2017
81690e6
Merge pull request #146 from cypress-io/#144-typo-in-why
Oct 16, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,20 +55,22 @@ npm start
Visit [http://localhost:2222/](http://localhost:2222/).

**note** If you need to debug documentation build step run with environment
variable set `DEBUG=docs npm run build`
variable set `DEBUG=docs npm run build`

## Writing Documentation

### Adding Examples

The documents outlining examples are within the [`source/examples`](/source/examples) directory. Each document is written in markdown with a little bit of [Hexo flair](https://hexo.io/docs/tag-plugins.html). To add an example to a document, just try to follow the formatting of any previous examples in the markdown file.
To add an blog, talk, or podcast to our docs, just add your data to the corresponding [blogs.yml](https://github.com/cypress-io/cypress-documentation/blob/develop/source/_data/blogs.yml), [talks.yml](https://github.com/cypress-io/cypress-documentation/blob/develop/source/_data/talks.yml), or [podcasts.yml](https://github.com/cypress-io/cypress-documentation/blob/develop/source/_data/podcasts.yml) file.

Add an associating image with the example within the [`source/img/examples`](/source/img/examples) directory. Each image should be resolution **715w x 480h**. Reference the image in the markdown document as follows:

```md
{% img /img/examples/name-of-file.jpg "alt text describing img" %}
```

To add anything else to an example page, the documents outlining examples are within the [`source/examples`](/source/examples) directory. Each document is written in markdown with a little bit of [Hexo flair](https://hexo.io/docs/tag-plugins.html). To add an example to a document, just try to follow the formatting of any previous examples in the markdown file.

## Commiting Code

### Linting
Expand Down
13 changes: 13 additions & 0 deletions cypress/integration/api_spec.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,19 @@ describe "API", ->
sidebarLink = @sidebarLinks[i]
expect(displayedLink.attr('href')).to.include(sidebarLink)

context "mobile sidebar menu", ->
beforeEach ->
cy.viewport('iphone-6')

it "displays sidebar in mobile menu on click", ->
cy.get("#mobile-nav-toggle").click()
cy.get("#mobile-nav-inner").should("be.visible")
.find(".sidebar-li")
.first(1).each (displayedLink, i) ->
englishLink = @english.sidebar.api[@sidebarLinkNames[i]]
expect(displayedLink.text().trim()).to.eq(englishLink)


## This is running too slow to include for now
## Issue #431 Needs to be fixed first
## https://github.com/cypress-io/cypress/issues/431
Expand Down
12 changes: 12 additions & 0 deletions cypress/integration/dashboard_spec.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,15 @@ describe "Dashboard", ->
.find(".sidebar-link").each (displayedLink, i) ->
sidebarLink = @sidebarLinks[i]
expect(displayedLink.attr('href')).to.include(sidebarLink)

context "mobile sidebar menu", ->
beforeEach ->
cy.viewport('iphone-6')

it "displays sidebar in mobile menu on click", ->
cy.get("#mobile-nav-toggle").click()
cy.get("#mobile-nav-inner").should("be.visible")
.find(".sidebar-li")
.first(1).each (displayedLink, i) ->
englishLink = @english.sidebar.dashboard[@sidebarLinkNames[i]]
expect(displayedLink.text().trim()).to.eq(englishLink)
12 changes: 12 additions & 0 deletions cypress/integration/examples_spec.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,15 @@ describe "Examples", ->
.find(".sidebar-link").each (displayedLink, i) ->
sidebarLink = @sidebarLinks[i]
expect(displayedLink.attr('href')).to.include(sidebarLink)

context "mobile sidebar menu", ->
beforeEach ->
cy.viewport('iphone-6')

it "displays sidebar in mobile menu on click", ->
cy.get("#mobile-nav-toggle").click()
cy.get("#mobile-nav-inner").should("be.visible")
.find(".sidebar-li")
.first(1).each (displayedLink, i) ->
englishLink = @english.sidebar.examples[@sidebarLinkNames[i]]
expect(displayedLink.text().trim()).to.eq(englishLink)
12 changes: 12 additions & 0 deletions cypress/integration/faq_spec.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,18 @@ describe "FAQ", ->
sidebarLink = @sidebarLinks[i]
expect(displayedLink.attr('href')).to.include(sidebarLink)

context "mobile sidebar menu", ->
beforeEach ->
cy.viewport('iphone-6')

it "displays sidebar in mobile menu on click", ->
cy.get("#mobile-nav-toggle").click()
cy.get("#mobile-nav-inner").should("be.visible")
.find(".sidebar-li")
.first(1).each (displayedLink, i) ->
englishLink = @english.sidebar.faq[@sidebarLinkNames[i]]
expect(displayedLink.text().trim()).to.eq(englishLink)

context "Table of Contents", ->
it "displays toc links", ->
cy.get('.toc-level-2>.toc-link').as('tocLinks')
Expand Down
12 changes: 12 additions & 0 deletions cypress/integration/guides_spec.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,18 @@ describe "Guides", ->
sidebarLink = @sidebarLinks[i]
expect(displayedLink.attr('href')).to.include(sidebarLink)

context "mobile sidebar menu", ->
beforeEach ->
cy.viewport('iphone-6')

it "displays sidebar in mobile menu on click", ->
cy.get("#mobile-nav-toggle").click()
cy.get("#mobile-nav-inner").should("be.visible")
.find(".sidebar-li")
.first(1).each (displayedLink, i) ->
englishLink = @english.sidebar.guides[@sidebarLinkNames[i]]
expect(displayedLink.text().trim()).to.eq(englishLink)

## This is running too slow to include for now
## Issue #431 Needs to be fixed first
## https://github.com/cypress-io/cypress/issues/431
Expand Down
67 changes: 37 additions & 30 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"colors": "^1.1.2",
"common-tags": "^1.4.0",
"concurrent-transform": "^1.0.0",
"cypress": "^0.20.0",
"cypress": "^1.0.2",
"dependency-check": "^2.9.1",
"deps-ok": "^1.2.0",
"eslint": "^4.6.1",
Expand Down
Loading