Merge pull request #442 from cypress-io/develop

Develop

package.json

@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "private": true,
   "hexo": {
-    "version": "3.5.0"
+    "version": "3.6.0"
   },
   "engines": {
     "node": "^8.4.0"
@@ -52,7 +52,7 @@
     "cypress": "^2.1.0",
     "dependency-check": "^3.0.0",
     "deps-ok": "^1.2.0",
-    "eslint": "4.18.1",
+    "eslint": "4.18.2",
     "eslint-plugin-cypress-dev": "1.1.2",
     "fs-extra": "^5.0.0",
     "ggit": "2.4.2",
@@ -106,4 +106,4 @@
     "menuspy": "1.3.0",
     "scrollingelement": "1.5.2"
   }
-}
+}

source/_data/talks.yml

@@ -1,3 +1,27 @@
+- title: "End to End Testing: The Game Has Changed"
+  url: https://www.youtube.com/watch?v=D-h3bhzauKo&feature=youtu.be&t=11383
+  sourceName: JSConf Iceland
+  sourceUrl: https://2018.jsconf.is/
+  date: Mar 1, 2018
+  author: Will Klein
+  img: /img/examples/ui-state-time-travel-js-conf-iceland.jpg
+
+- title: "Moving Around the Testing Pyramid"
+  url: https://www.youtube.com/watch?v=5XQOK0v_YRE&t=0s&index=4&list=PLZ66c9_z3umNSrKSb5cmpxdXZcIPNvKGw
+  sourceName: "Assert(js)"
+  sourceUrl: https://www.youtube.com/watch?v=5FnalKRjpZk&t=0s&index=5&list=PLZ66c9_z3umNSrKSb5cmpxdXZcIPNvKGw
+  date: Feb 22, 2018
+  author: Gleb Bahmutov
+  img: /img/examples/moving-the-testing-pyramid.jpg
+
+- title: "Cypress Best Practices"
+  url: https://www.youtube.com/watch?v=5XQOK0v_YRE&t=0s&index=4&list=PLZ66c9_z3umNSrKSb5cmpxdXZcIPNvKGw
+  sourceName: "Assert(js)"
+  sourceUrl: https://www.youtube.com/playlist?list=PLZ66c9_z3umNSrKSb5cmpxdXZcIPNvKGw&mc_cid=ddf9309c22&mc_eid=c05d20b621
+  date: Feb 22, 2018
+  author: Brian Mann
+  img: /img/examples/best-practices-at-assert-js.jpg
+
 - title: "End to End Testing: The Game Has Changed"
   url: https://www.youtube.com/watch?v=rICGz5qrYJU&feature=youtu.be&t=1h14m46s
   sourceName: ReactJS Denver

source/api/commands/select.md

@@ -69,7 +69,8 @@ Option | Default | Description
 
 ```javascript
 // yields <option value="456">apples</option>
-cy.get('select').select('apples')
+cy.get('select')
+  .select('apples').should('have.value', '456')
 ```
 
 ## Value
@@ -86,7 +87,8 @@ cy.get('select').select('apples')
 
 ```javascript
 // yields <option value="456">apples</option>
-cy.get('select').select('456')
+cy.get('select')
+  .select('456').should('have.value', '456')
 ```
 
 ## Select multiple options
@@ -102,7 +104,9 @@ cy.get('select').select('456')
 ```
 
 ```javascript
-cy.get('select').select(['apples', 'bananas'])
+cy.get('select')
+  .select(['apples', 'bananas']).invoke('val')
+  .should('deep.equal', ['456', '458'])
 ```
 
 ***Select the options with the values "456" and "457"***
@@ -116,7 +120,9 @@ cy.get('select').select(['apples', 'bananas'])
 ```
 
 ```javascript
-cy.get('select').select(['456', '457'])
+cy.get('select')
+  .select(['456', '457']).invoke('val')
+  .should('deep.equal', ['456', '457'])
 ```
 
 # Notes

source/api/commands/wrap.md

@@ -71,7 +71,7 @@ cy.get('form').within(($form) => {
 cy
   .get('button')
   .then(($button) => {
-    // $el is a wrapped jQuery element
+    // $button is a wrapped jQuery element
     if ($button.someMethod() === 'something') {
       // wrap this element so we can
       // use cypress commands on it

source/guides/core-concepts/conditional-testing.md

@@ -209,7 +209,7 @@ Once again - we will need another reliable way to achieve this without involving
 
 These patterns are pretty much the same as before:
 
-***Use the URL to control it:****
+***Use the URL to control it:***
 
 ```js
 // dont show the wizard

source/guides/core-concepts/variables-and-aliases.md

@@ -24,7 +24,7 @@ Once you get the hang of async code - you'll realize you can do everything you c
 This guide explores many common patterns for writing good Cypress code that can handle even the most complex situations.
 {% endnote %}
 
-Asynchronous API's are here to stay in JavaScript. They are found everywhere in modern code. In fact, most new browser API's are asynchronous and many core `Node.js` are asynchronous as well.
+Asynchronous API's are here to stay in JavaScript. They are found everywhere in modern code. In fact, most new browser API's are asynchronous and many core `Node.js` modules are asynchronous as well.
 
 The patterns we'll explore below are useful in and outside of Cypress.
 

source/guides/guides/launching-browsers.md

@@ -52,7 +52,7 @@ To use this command in CI, you need to install these other browsers - or use one
 
 ## Unsupported Browsers
 
-Many browsers are not currently supported, but are on our roadmap. You can read an exhaustive explanation about our future cross browser testing strategy {% issue 310 'here' %}.
+Many browsers such as Firefox, Safari, and Internet Explorer are not currently supported. Support for more browsers is on our roadmap. You can read an exhaustive explanation about our future cross browser testing strategy {% issue 310 'here' %}.
 
 # Browser Environment