Merge branch 'master' of github.com:atecarlos/protractor-http-mock

Carlos Atencio · Carlos Atencio · commit 37aa544658e6 · 2016-04-06T23:02:16.000-04:00
diff --git a/README.md b/README.md
@@ -26,7 +26,7 @@ We can also configure our root directory where the mocks and protractor configur
   	onPrepare: function(){
     	require('protractor-http-mock').config = {
 			rootDirectory: __dirname, // default value: process.cwd()
-			protractorConfig: 'my-protractor-config.conf' // default value: 'protractor.conf'
+			protractorConfig: 'my-protractor-config.conf' // default value: 'protractor-conf.js'
     	};
   	}
 

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ We can also configure our root directory where the mocks and protractor configur`
`26`	`26`	`onPrepare: function(){`
`27`	`27`	`require('protractor-http-mock').config = {`
`28`	`28`	`rootDirectory: __dirname, // default value: process.cwd()`
`29`		`- protractorConfig: 'my-protractor-config.conf' // default value: 'protractor.conf'`
	`29`	`+ protractorConfig: 'my-protractor-config.conf' // default value: 'protractor-conf.js'`
`30`	`30`	`};`
`31`	`31`	`}`
`32`	`32`