From 2d5cae2b703b3289036d9308a761d4b6b44d375b Mon Sep 17 00:00:00 2001
From: "miherlosev@mail.ru" <Ein7Onai>
Date: Tue, 18 Apr 2017 15:39:38 +0300
Subject: [PATCH 1/9] Angular1Selector implemented

---
 .babelrc                 |   3 +
 .editoreconfig           |  15 +++++
 .eslintrc                |  87 ++++++++++++++++++++++++++++
 .gitattributes           |  17 ++++++
 .gitignore               |  52 +++++++++++++++++
 .publishrc               |  13 +++++
 README.md                |  77 +++++++++++++++++++++++++
 appveyor.yml             |  19 +++++++
 package.json             |  26 +++++++++
 src/angular1-selector.js | 119 +++++++++++++++++++++++++++++++++++++++
 src/index.js             |   3 +
 test/.eslintrc           |   6 ++
 test/angular1-test.js    |  69 +++++++++++++++++++++++
 test/data/ng1/app.js     |  22 ++++++++
 test/data/ng1/index.html |  34 +++++++++++
 15 files changed, 562 insertions(+)
 create mode 100644 .babelrc
 create mode 100644 .editoreconfig
 create mode 100644 .eslintrc
 create mode 100644 .gitattributes
 create mode 100644 .gitignore
 create mode 100644 .publishrc
 create mode 100644 appveyor.yml
 create mode 100644 package.json
 create mode 100644 src/angular1-selector.js
 create mode 100644 src/index.js
 create mode 100644 test/.eslintrc
 create mode 100644 test/angular1-test.js
 create mode 100644 test/data/ng1/app.js
 create mode 100644 test/data/ng1/index.html

diff --git a/.babelrc b/.babelrc
new file mode 100644
index 0000000..af0f0c3
--- /dev/null
+++ b/.babelrc
@@ -0,0 +1,3 @@
+{
+  "presets": ["es2015"]
+}
\ No newline at end of file
diff --git a/.editoreconfig b/.editoreconfig
new file mode 100644
index 0000000..956a53a
--- /dev/null
+++ b/.editoreconfig
@@ -0,0 +1,15 @@
+# This file is for unifying the coding style for different editors and IDEs
+# editorconfig.org
+
+root = true
+
+[*]
+end_of_line = lf
+charset = utf-8
+insert_final_newline = true
+trim_trailing_whitespace = true
+indent_style = space
+indent_size = 4
+
+[{.eslintrc,package.json,.travis.yml}]
+indent_size = 2
\ No newline at end of file
diff --git a/.eslintrc b/.eslintrc
new file mode 100644
index 0000000..08d990a
--- /dev/null
+++ b/.eslintrc
@@ -0,0 +1,87 @@
+{
+  "parser": "babel-eslint",
+  "extends": "eslint:recommended",
+  "rules": {
+    "no-alert": 2,
+    "no-array-constructor": 2,
+    "no-caller": 2,
+    "no-catch-shadow": 2,
+    "no-console": 0,
+    "no-eval": 2,
+    "no-extend-native": 2,
+    "no-extra-bind": 2,
+    "no-implied-eval": 2,
+    "no-iterator": 2,
+    "no-label-var": 2,
+    "no-labels": 2,
+    "no-lone-blocks": 2,
+    "no-loop-func": 2,
+    "no-multi-str": 2,
+    "no-native-reassign": 2,
+    "no-new": 2,
+    "no-new-func": 0,
+    "no-new-object": 2,
+    "no-new-wrappers": 2,
+    "no-octal-escape": 2,
+    "no-proto": 2,
+    "no-return-assign": 2,
+    "no-script-url": 2,
+    "no-sequences": 2,
+    "no-shadow": 2,
+    "no-shadow-restricted-names": 2,
+    "no-spaced-func": 2,
+    "no-undef-init": 2,
+    "no-unused-expressions": 2,
+    "no-with": 2,
+    "camelcase": 2,
+    "comma-spacing": 2,
+    "consistent-return": 2,
+    "eqeqeq": 2,
+    "semi": 2,
+    "semi-spacing": [2, {"before": false, "after": true}],
+    "space-infix-ops": 2,
+    "space-unary-ops": [2, { "words": true, "nonwords": false }],
+    "yoda": [2, "never"],
+    "brace-style": [2, "stroustrup", { "allowSingleLine": false }],
+    "eol-last": 2,
+    "indent": 2,
+    "key-spacing": [2, { "align": "value" }],
+    "max-nested-callbacks": [2, 3],
+    "new-parens": 2,
+    "newline-after-var": [2, "always"],
+    "no-lonely-if": 2,
+    "no-multiple-empty-lines":  [2, { "max": 2 }],
+    "no-nested-ternary": 2,
+    "no-underscore-dangle": 0,
+    "no-unneeded-ternary": 2,
+    "object-curly-spacing": [2, "always"],
+    "operator-assignment": [2, "always"],
+    "quotes": [2, "single", "avoid-escape"],
+    "space-before-blocks": [2, "always"],
+    "prefer-const": 2,
+    "no-path-concat": 2,
+    "no-undefined": 2,
+    "keyword-spacing": 2,
+    "strict": 0,
+    "curly": [2, "multi-or-nest"],
+    "dot-notation": 0,
+    "no-else-return": 2,
+    "one-var": [2, "never"],
+    "no-multi-spaces": [2, {
+      "exceptions": {
+        "VariableDeclarator": true,
+        "AssignmentExpression": true
+      }
+    }],
+    "radix": 2,
+    "no-extra-parens": 2,
+    "new-cap": [2, { "capIsNew": false }],
+    "space-before-function-paren": [2, "always"],
+    "no-use-before-define" : [2, "nofunc"],
+    "handle-callback-err": 0
+  },
+  "env": {
+    "node": true,
+    "browser": true
+  }
+}
\ No newline at end of file
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..6ad4083
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,17 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Custom for Visual Studio
+*.cs     diff=csharp
+
+# Standard to msysgit
+*.doc	 diff=astextplain
+*.DOC	 diff=astextplain
+*.docx diff=astextplain
+*.DOCX diff=astextplain
+*.dot  diff=astextplain
+*.DOT  diff=astextplain
+*.pdf  diff=astextplain
+*.PDF	 diff=astextplain
+*.rtf	 diff=astextplain
+*.RTF diff=astextplain
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..2bc8632
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,52 @@
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+# =========================
+# Operating System Files
+# =========================
+
+# OSX
+# =========================
+
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+node_modules/*
+.idea/*
+lib/*
+test/data/lib/*
diff --git a/.publishrc b/.publishrc
new file mode 100644
index 0000000..ab8381a
--- /dev/null
+++ b/.publishrc
@@ -0,0 +1,13 @@
+{
+  "validations": {
+    "vulnerableDependencies": false,
+    "uncommittedChanges": true,
+    "untrackedFiles": true,
+    "sensitiveData": true,
+    "branch": "master",
+    "gitTag": true
+  },
+  "confirm": true,
+  "publishTag": "latest",
+  "prePublishScript": "npm test"
+}
\ No newline at end of file
diff --git a/README.md b/README.md
index 6f076e3..12e156b 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,78 @@
 # testcafe-angular-selectors
+
+This plugin provides selector extensions that make it easier to test Angular applications with [TestCafe](https://github.com/DevExpress/testcafe/).
+
+## Install
+
+```
+npm install testcafe-angular-selectors
+```
+
+## Angular1 Selector extensions
+
+### byBinding
+Find elements by text binding. Does a partial match, so any elements can be returned.
+```js
+Angular1Selector.byBinding(expression, parentSelector)
+```
+Parameter                   | Description
+--------------------------- | -----------
+expression                        |  The JavaScript expression to which the element's `textContent` is bound.
+parentSelector&#160;*(optional)*  | A TestCafe [selector](https://devexpress.github.io/testcafe/documentation/test-api/selecting-page-elements/selectors.html). If specified, TestCafe will search for the target element among the descendants of the element identified by this selector.
+
+NOTE: we don't support a deprecated syntax `Angular1Selector.byBinding('{{person.name}}')`
+
+### byExactBinding
+Find elements by exact binding.
+```js
+Angular1Selector.byExactBinding(expression, parentSelector)
+```
+Parameter                   | Description
+--------------------------- | -----------
+expression                        |  The JavaScript expression to which the element's `textContent` is bound.
+parentSelector&#160;*(optional)*  | A TestCafe [selector](https://devexpress.github.io/testcafe/documentation/test-api/selecting-page-elements/selectors.html). If specified, TestCafe will search for the target element among the descendants of the element identified by this selector.
+
+### byModel
+Find elements by 'ng-model' expression
+```js
+Angular1Selector.byModel(expression, parentSelector)
+```
+Parameter                   | Description
+--------------------------- | -----------
+expression                        |  The JavaScript expression to data-bind property of the scope to input,select, textarea (or custom form control).
+parentSelector&#160;*(optional)*  | A TestCafe [selector](https://devexpress.github.io/testcafe/documentation/test-api/selecting-page-elements/selectors.html). If specified, TestCafe will search for the target element among the descendants of the element identified by this selector.
+
+### byOptions
+                 
+Find elements by 'ng-options' expression.
+```js
+Angular1Selector.byOptions(expression, parentSelector)
+```
+Parameter                   | Description
+--------------------------- | -----------
+expression                        |  The JavaScript expression to dynamically generate a list of <option> elements for the <select> element
+parentSelector&#160;*(optional)*  | A TestCafe [selector](https://devexpress.github.io/testcafe/documentation/test-api/selecting-page-elements/selectors.html). If specified, TestCafe will search for the target element among the descendants of the element identified by this selector.
+
+### byRepeater
+Find elements by repeater. Does a partial match, so any elements can be returned.
+```js
+Angular1Selector.byRepeater(expression, parentSelector)
+```
+Parameter                   | Description
+--------------------------- | -----------
+expression                        |  The JavaScript expression to instantiate a template once per item from a collection.
+parentSelector&#160;*(optional)*  | A TestCafe [selector](https://devexpress.github.io/testcafe/documentation/test-api/selecting-page-elements/selectors.html). If specified, TestCafe will search for the target element among the descendants of the element identified by this selector.
+
+### byExactRepeat
+Find elements by exact repeater.
+```js
+Angular1Selector.byExactRepeat(expression, parentSelector)
+```
+Parameter                   | Description
+--------------------------- | -----------
+expression                        |  The JavaScript expression to instantiate a template once per item from a collection.
+parentSelector&#160;*(optional)*  | A TestCafe [selector](https://devexpress.github.io/testcafe/documentation/test-api/selecting-page-elements/selectors.html). If specified, TestCafe will search for the target element among the descendants of the element identified by this selector.
+             
+
+## Angular2 Selector extensions
+Angular2 component selectors is coming...
\ No newline at end of file
diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 0000000..f692b5f
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,19 @@
+environment:
+  NODEJS_VERSION: "stable"
+
+install:
+- ps: >-
+    Install-Product node $env:NODEJS_VERSION
+
+    choco install GoogleChrome
+
+    choco install Firefox
+
+- cmd: >-
+    npm install
+
+build: off
+
+test_script:
+- cmd: >-
+    npm test
\ No newline at end of file
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..42b199f
--- /dev/null
+++ b/package.json
@@ -0,0 +1,26 @@
+{
+  "name": "testcafe-angular-selectors",
+  "version": "0.0.1",
+  "scripts": {
+    "lint": "eslint src/*.js test/*.js",
+    "http-server": "http-server ./ -s",
+    "testcafe": "testcafe all test/*-test.js --app \"npm run http-server\"",
+    "test": "npm run build && npm run testcafe",
+    "build": "babel src --out-dir lib",
+    "publish-please": "publish-please",
+    "prepublish": "publish-please guard"
+  },
+  "devDependencies": {
+    "angular": "^1.6.4",
+    "babel-cli": "^6.22.2",
+    "babel-eslint": "^7.1.1",
+    "babel-preset-es2015": "^6.22.0",
+    "eslint": "^3.15.0",
+    "eslint-plugin-testcafe": "^0.2.1",
+    "http-server": "^0.9.0",
+    "publish-please": "^2.2.0"
+  },
+  "dependencies": {
+    "testcafe": "^0.15.0"
+  }
+}
diff --git a/src/angular1-selector.js b/src/angular1-selector.js
new file mode 100644
index 0000000..f54e29d
--- /dev/null
+++ b/src/angular1-selector.js
@@ -0,0 +1,119 @@
+/*global window*/
+
+import { Selector, ClientFunction } from 'testcafe';
+
+class Angular1Selector {
+    constructor () {
+        const getComparer            = ClientFunction(exactMatch => {
+            const strictComparer   = function (item1, item2) {
+                return item1 === item2;
+            };
+            const containsComparer = function (item1, item2) {
+                return item1.indexOf(item2) !== -1;
+            };
+
+            return exactMatch ? strictComparer : containsComparer;
+        });
+        const testNodeForAngularAttr = ClientFunction((node, attrSuffix) => {
+            const ANGULAR_ATTR_PREFIXES = ['ng-', 'ng_', 'data-ng-', 'x-ng-', 'ng\\:'];
+            const result                = {
+                hasAttr: false
+            };
+
+            for (let i = 0; i < ANGULAR_ATTR_PREFIXES.length; i++) {
+                const prefix   = ANGULAR_ATTR_PREFIXES[i];
+                const attrName = prefix + attrSuffix;
+
+                if (node.hasAttribute && node.hasAttribute(attrName)) {
+                    result.attrName = attrName;
+                    result.hasAttr  = true;
+                    break;
+                }
+            }
+
+            return result;
+        });
+        const ensureParent           = parentSelector => parentSelector || Selector(() => document.documentElement);
+
+        this._findByBinding     = (expression, parentSelector, exactMatch) => {
+            const parent       = ensureParent(parentSelector);
+            const dependencies = { getComparer, exactMatch, expression };
+            const filter       = ClientFunction(node => {
+                const dataBinding = window.angular.element(node).data('$binding');
+
+                if (!dataBinding)
+                    return false;
+
+                const bindingNameArr = dataBinding.exp || dataBinding[0].exp || dataBinding;
+                const bindingName    = Array.isArray(bindingNameArr) ? bindingNameArr[0] : bindingNameArr;
+                const comparer       = getComparer(exactMatch);
+
+                return comparer(bindingName, expression);
+            });
+
+            return parent
+                .find('.ng-binding')
+                .filter(filter, dependencies);
+        };
+        this._findByAngularAttr = (name, value, parentSelector, exactMatch) => {
+            const parent       = ensureParent(parentSelector);
+            const dependencies = { getComparer, testNodeForAngularAttr, exactMatch, name, value };
+            const filter       = ClientFunction(node => {
+                const result = testNodeForAngularAttr(node, name);
+
+                if (!result.hasAttr)
+                    return false;
+
+                const bindingAttrValue = node.getAttribute(result.attrName) || '';
+                const comparer         = getComparer(exactMatch);
+
+                return comparer(bindingAttrValue, value);
+            });
+
+            return parent.find(filter, dependencies);
+        };
+    }
+
+    _assertNonEmptyStringParameter (paramName, paramValue) {
+        if (typeof paramValue !== 'string' || !paramValue)
+            throw new Error(`"${paramName}" parameter should be a non-empty string`);
+    }
+
+    byBinding (expression, parentSelector) {
+        this._assertNonEmptyStringParameter('Binding expression', expression);
+
+        return this._findByBinding(expression, parentSelector);
+    }
+
+    byExactBinding (expression, parentSelector) {
+        this._assertNonEmptyStringParameter('Binding expression', expression);
+
+        return this._findByBinding(expression, parentSelector, true);
+    }
+
+    byModel (expression, parentSelector) {
+        this._assertNonEmptyStringParameter('Model expression', expression);
+
+        return this._findByAngularAttr('model', expression, parentSelector, true);
+    }
+
+    byOptions (expression, parentSelector) {
+        this._assertNonEmptyStringParameter('Options expression', expression);
+
+        return this._findByAngularAttr('options', expression, parentSelector, true);
+    }
+
+    byRepeater (expression, parentSelector) {
+        this._assertNonEmptyStringParameter('Repeat expression', expression);
+
+        return this._findByAngularAttr('repeat', expression, parentSelector);
+    }
+
+    byExactRepeater (expression, parentSelector) {
+        this._assertNonEmptyStringParameter('Repeat expression', expression);
+
+        return this._findByAngularAttr('repeat', expression, parentSelector, true);
+    }
+}
+
+export default new Angular1Selector();
diff --git a/src/index.js b/src/index.js
new file mode 100644
index 0000000..d71d396
--- /dev/null
+++ b/src/index.js
@@ -0,0 +1,3 @@
+import Angular1Selector from './angular1-selector';
+
+export { Angular1Selector };
diff --git a/test/.eslintrc b/test/.eslintrc
new file mode 100644
index 0000000..cb7b5f5
--- /dev/null
+++ b/test/.eslintrc
@@ -0,0 +1,6 @@
+{
+  "plugins": [
+    "testcafe"
+  ],
+  "extends": "plugin:testcafe/recommended"
+}
\ No newline at end of file
diff --git a/test/angular1-test.js b/test/angular1-test.js
new file mode 100644
index 0000000..d84bf0a
--- /dev/null
+++ b/test/angular1-test.js
@@ -0,0 +1,69 @@
+import { Angular1Selector } from '../lib';
+import { Selector } from 'testcafe';
+
+fixture `Angular 1.x tests`
+    .page('http://localhost:8080/test/data/ng1');
+
+test('byBinding', async t => {
+    await t
+        .expect(Angular1Selector.byBinding('person.name').textContent).eql('John Smith')
+        .expect(Angular1Selector.byBinding('person.email').textContent).eql('johnsmith@company.com')
+        .expect(Angular1Selector.byBinding('{{person.name}}').exists).notOk()
+        .expect(Angular1Selector.byBinding('person.name', Selector('#wrapper')).exists).ok()
+        .expect(Angular1Selector.byBinding('person.name', Selector('#wrong')).exists).notOk()
+        .expect(Angular1Selector.byBinding('person.n').exists).ok();
+});
+
+test('byExactBinding', async t => {
+    await t
+        .expect(Angular1Selector.byExactBinding('person.phone|lowercase').textContent).eql('1234567890')
+        .expect(Angular1Selector.byExactBinding('person.salary|number:4').exists).ok()
+        .expect(Angular1Selector.byExactBinding('person.salary|number').exists).notOk();
+});
+
+test('byModel', async t => {
+    await t
+        .expect(Angular1Selector.byModel('person.name').exists).ok()
+        .expect(Angular1Selector.byModel('person.wrong').exists).notOk()
+        .expect(Angular1Selector.byModel('person.name', Selector('#wrapper')).exists).ok()
+        .expect(Angular1Selector.byModel('person.name', Selector('#wrong')).exists).notOk();
+});
+
+test('byOptions', async t => {
+    await t
+        .expect(Angular1Selector.byOptions('location as location.name for location in person.locations').exists).ok()
+        .expect(Angular1Selector.byOptions('location in person.locations').exists).notOk();
+});
+
+test('byRepeater', async t => {
+    await t
+        .expect(Angular1Selector.byRepeater('pet in person.pets').exists).ok()
+        .expect(Angular1Selector.byRepeater('person.pets').exists).ok()
+        .expect(Angular1Selector.byRepeater('person.pets1').exists).notOk();
+});
+
+test('byExactRepeater', async t => {
+    await t
+        .expect(Angular1Selector.byExactRepeater('pet in person.pets').exists).ok()
+        .expect(Angular1Selector.byExactRepeater('person.pets').exists).notOk();
+});
+
+test('throwing errors', async t => {
+    const Angular1SelectorProto = Object.getPrototypeOf(Angular1Selector);
+
+    const methodNames = Object.getOwnPropertyNames(Angular1SelectorProto)
+        .filter(propertyName => {
+            return typeof Angular1SelectorProto[propertyName] === 'function' &&
+                   propertyName.indexOf('_') !== 0 &&
+                   propertyName !== 'constructor';
+        });
+
+    for (const method of methodNames) {
+        try {
+            await Angular1SelectorProto[method]();
+        }
+        catch (err) {
+            await t.expect(err.message).contains('parameter should be a non-empty string');
+        }
+    }
+});
diff --git a/test/data/ng1/app.js b/test/data/ng1/app.js
new file mode 100644
index 0000000..232f24a
--- /dev/null
+++ b/test/data/ng1/app.js
@@ -0,0 +1,22 @@
+var ng1App = angular.module('ng1', []);
+
+ng1App.controller('MainController', function MainController ($scope) {
+    $scope.person = {
+        name:               'John Smith',
+        email:              'johnsmith@company.com',
+        phone:              '1234567890',
+        salary:             1234.56789,
+        pets:               [
+            { name: 'cat', age: 3 },
+            { name: 'dog', age: 6 }
+        ],
+        locations:          [
+            { id: 1, name: 'London' },
+            { id: 2, name: 'Paris' }
+        ]
+    };
+
+    $scope.info = {
+        angularVersion: window.angular.version.full
+    };
+});
diff --git a/test/data/ng1/index.html b/test/data/ng1/index.html
new file mode 100644
index 0000000..c99990c
--- /dev/null
+++ b/test/data/ng1/index.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<html lang="en" lang="en" ng-app="ng1">
+<head>
+    <meta charset="UTF-8">
+    <script src="/node_modules/angular/angular.js"></script>
+    <script src="app.js"></script>
+    <title></title>
+</head>
+<body ng-controller="MainController">
+<div id="data">
+    <h1 id="angular-version">Angular {{info.angularVersion}}</h1>
+    <h2>Person details</h2>
+    <div id="wrapper">
+        <div>{{person.name}}</div>
+        <div ng-bind="person.email"></div>
+        <div>{{person.phone|lowercase}}</div>
+        <div>{{person.salary|number:4}}</div>
+        <div>
+            <input type="text" ng-model="person.name">
+        </div>
+        <h3>Pets</h3>
+        <ul>
+            <li ng-repeat="pet in person.pets">
+                <span>{{pet.name}} - </span>
+                <span>{{pet.age}} year (s)</span>
+            </li>
+        </ul>
+        <select ng-model="person.selectedLocation"
+                ng-options="location as location.name for location in person.locations">
+        </select>
+    </div>
+</div>
+</body>
+</html>
\ No newline at end of file

From 3b2699a8f09e710d61c764698ddba3177787ec78 Mon Sep 17 00:00:00 2001
From: "miherlosev@mail.ru" <Ein7Onai>
Date: Fri, 28 Apr 2017 14:56:07 +0300
Subject: [PATCH 2/9] fix VasilyStrelyaev's remarks

---
 README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 12e156b..4b11758 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ npm install testcafe-angular-selectors
 ## Angular1 Selector extensions
 
 ### byBinding
-Find elements by text binding. Does a partial match, so any elements can be returned.
+Find elements by text binding. Does a partial match, so any elements bound to variables containing the input string will be returned.
 ```js
 Angular1Selector.byBinding(expression, parentSelector)
 ```
@@ -39,7 +39,7 @@ Angular1Selector.byModel(expression, parentSelector)
 ```
 Parameter                   | Description
 --------------------------- | -----------
-expression                        |  The JavaScript expression to data-bind property of the scope to input,select, textarea (or custom form control).
+expression                        | The JavaScript expression used to bind a property on the scope to an input, select, textarea (or a custom form control).
 parentSelector&#160;*(optional)*  | A TestCafe [selector](https://devexpress.github.io/testcafe/documentation/test-api/selecting-page-elements/selectors.html). If specified, TestCafe will search for the target element among the descendants of the element identified by this selector.
 
 ### byOptions
@@ -50,17 +50,17 @@ Angular1Selector.byOptions(expression, parentSelector)
 ```
 Parameter                   | Description
 --------------------------- | -----------
-expression                        |  The JavaScript expression to dynamically generate a list of <option> elements for the <select> element
+expression                        | The JavaScript expression used to generate a list of <option> elements for the <select> element.
 parentSelector&#160;*(optional)*  | A TestCafe [selector](https://devexpress.github.io/testcafe/documentation/test-api/selecting-page-elements/selectors.html). If specified, TestCafe will search for the target element among the descendants of the element identified by this selector.
 
 ### byRepeater
-Find elements by repeater. Does a partial match, so any elements can be returned.
+Find elements by repeater. Does a partial match, so any elements bound to variables containing the input string will be returned.
 ```js
 Angular1Selector.byRepeater(expression, parentSelector)
 ```
 Parameter                   | Description
 --------------------------- | -----------
-expression                        |  The JavaScript expression to instantiate a template once per item from a collection.
+expression                        | The JavaScript expression used to instantiate a template.
 parentSelector&#160;*(optional)*  | A TestCafe [selector](https://devexpress.github.io/testcafe/documentation/test-api/selecting-page-elements/selectors.html). If specified, TestCafe will search for the target element among the descendants of the element identified by this selector.
 
 ### byExactRepeat
@@ -70,7 +70,7 @@ Angular1Selector.byExactRepeat(expression, parentSelector)
 ```
 Parameter                   | Description
 --------------------------- | -----------
-expression                        |  The JavaScript expression to instantiate a template once per item from a collection.
+expression                        | The JavaScript expression used to instantiate a template.
 parentSelector&#160;*(optional)*  | A TestCafe [selector](https://devexpress.github.io/testcafe/documentation/test-api/selecting-page-elements/selectors.html). If specified, TestCafe will search for the target element among the descendants of the element identified by this selector.
              
 

From 979caa6fae0d0fd6424fb07d725007c9f611bd4d Mon Sep 17 00:00:00 2001
From: "miherlosev@mail.ru" <Ein7Onai>
Date: Fri, 7 Jul 2017 16:32:15 +0300
Subject: [PATCH 3/9] small code changes

---
 src/angular1-selector.js | 34 ++++++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/angular1-selector.js b/src/angular1-selector.js
index f54e29d..1283d6a 100644
--- a/src/angular1-selector.js
+++ b/src/angular1-selector.js
@@ -74,43 +74,61 @@ class Angular1Selector {
         };
     }
 
-    _assertNonEmptyStringParameter (paramName, paramValue) {
+    _assertNonEmptyStringParameter ({ paramShortDescription, paramValue }) {
         if (typeof paramValue !== 'string' || !paramValue)
-            throw new Error(`"${paramName}" parameter should be a non-empty string`);
+            throw new Error(`"${paramShortDescription}" parameter should be a non-empty string`);
     }
 
     byBinding (expression, parentSelector) {
-        this._assertNonEmptyStringParameter('Binding expression', expression);
+        this._assertNonEmptyStringParameter({
+            paramShortDescription: 'Binding expression',
+            paramValue:            expression
+        });
 
         return this._findByBinding(expression, parentSelector);
     }
 
     byExactBinding (expression, parentSelector) {
-        this._assertNonEmptyStringParameter('Binding expression', expression);
+        this._assertNonEmptyStringParameter({
+            paramShortDescription: 'Binding expression',
+            paramValue:            expression
+        });
 
         return this._findByBinding(expression, parentSelector, true);
     }
 
     byModel (expression, parentSelector) {
-        this._assertNonEmptyStringParameter('Model expression', expression);
+        this._assertNonEmptyStringParameter({
+            paramShortDescription: 'Model expression',
+            paramValue:            expression
+        });
 
         return this._findByAngularAttr('model', expression, parentSelector, true);
     }
 
     byOptions (expression, parentSelector) {
-        this._assertNonEmptyStringParameter('Options expression', expression);
+        this._assertNonEmptyStringParameter({
+            paramShortDescription: 'Options expression',
+            paramValue:            expression
+        });
 
         return this._findByAngularAttr('options', expression, parentSelector, true);
     }
 
     byRepeater (expression, parentSelector) {
-        this._assertNonEmptyStringParameter('Repeat expression', expression);
+        this._assertNonEmptyStringParameter({
+            paramShortDescription: 'Repeat expression',
+            paramValue:            expression
+        });
 
         return this._findByAngularAttr('repeat', expression, parentSelector);
     }
 
     byExactRepeater (expression, parentSelector) {
-        this._assertNonEmptyStringParameter('Repeat expression', expression);
+        this._assertNonEmptyStringParameter({
+            paramShortDescription: 'Repeat expression',
+            paramValue:            expression
+        });
 
         return this._findByAngularAttr('repeat', expression, parentSelector, true);
     }

From 8f0bdf7f3b0f046f878b264a6891c790dcc164c9 Mon Sep 17 00:00:00 2001
From: "miherlosev@mail.ru" <Ein7Onai>
Date: Wed, 12 Jul 2017 14:00:10 +0300
Subject: [PATCH 4/9] fix Boris review issues

---
 README.md                | 16 ++++++++++++++++
 package.json             |  7 ++++---
 src/angular1-selector.js |  9 ++++++---
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 4b11758..8f8f127 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,22 @@ This plugin provides selector extensions that make it easier to test Angular app
 npm install testcafe-angular-selectors
 ```
 
+## Usage
+
+```js
+import { Angular1Selector1 } from 'testcafe-angular-selectors';
+import { Selector } from 'testcafe';
+
+fixture `TestFixture`
+    .page('http://todomvc.com/examples/angularjs/');
+
+test('add new item', async t => {
+    await t.typeText(Angular1Selector1.byModel('newTodo'), 'new item')
+        .pressKey('enter')
+        .expect(Selector('#todo-list').visible).ok();
+});
+```
+
 ## Angular1 Selector extensions
 
 ### byBinding
diff --git a/package.json b/package.json
index 42b199f..e1e5b47 100644
--- a/package.json
+++ b/package.json
@@ -18,9 +18,10 @@
     "eslint": "^3.15.0",
     "eslint-plugin-testcafe": "^0.2.1",
     "http-server": "^0.9.0",
-    "publish-please": "^2.2.0"
-  },
-  "dependencies": {
+    "publish-please": "^2.2.0",
     "testcafe": "^0.15.0"
+  },
+  "peerDependencies": {
+    "testcafe": "*"
   }
 }
diff --git a/src/angular1-selector.js b/src/angular1-selector.js
index 1283d6a..e206391 100644
--- a/src/angular1-selector.js
+++ b/src/angular1-selector.js
@@ -4,7 +4,7 @@ import { Selector, ClientFunction } from 'testcafe';
 
 class Angular1Selector {
     constructor () {
-        const getComparer            = ClientFunction(exactMatch => {
+        const getComparer = ClientFunction(exactMatch => {
             const strictComparer   = function (item1, item2) {
                 return item1 === item2;
             };
@@ -14,6 +14,7 @@ class Angular1Selector {
 
             return exactMatch ? strictComparer : containsComparer;
         });
+
         const testNodeForAngularAttr = ClientFunction((node, attrSuffix) => {
             const ANGULAR_ATTR_PREFIXES = ['ng-', 'ng_', 'data-ng-', 'x-ng-', 'ng\\:'];
             const result                = {
@@ -33,9 +34,10 @@ class Angular1Selector {
 
             return result;
         });
-        const ensureParent           = parentSelector => parentSelector || Selector(() => document.documentElement);
 
-        this._findByBinding     = (expression, parentSelector, exactMatch) => {
+        const ensureParent = parentSelector => parentSelector || Selector(() => document.documentElement);
+
+        this._findByBinding = (expression, parentSelector, exactMatch) => {
             const parent       = ensureParent(parentSelector);
             const dependencies = { getComparer, exactMatch, expression };
             const filter       = ClientFunction(node => {
@@ -55,6 +57,7 @@ class Angular1Selector {
                 .find('.ng-binding')
                 .filter(filter, dependencies);
         };
+
         this._findByAngularAttr = (name, value, parentSelector, exactMatch) => {
             const parent       = ensureParent(parentSelector);
             const dependencies = { getComparer, testNodeForAngularAttr, exactMatch, name, value };

From a0cca1140974703c20c22d932450d377293dbadc Mon Sep 17 00:00:00 2001
From: "miherlosev@mail.ru" <Ein7Onai>
Date: Wed, 12 Jul 2017 16:57:03 +0300
Subject: [PATCH 5/9] fix formatting

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8f8f127..401dbb1 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,8 @@ fixture `TestFixture`
     .page('http://todomvc.com/examples/angularjs/');
 
 test('add new item', async t => {
-    await t.typeText(Angular1Selector1.byModel('newTodo'), 'new item')
+    await t
+        .typeText(Angular1Selector1.byModel('newTodo'), 'new item')
         .pressKey('enter')
         .expect(Selector('#todo-list').visible).ok();
 });

From dc08e876dea63490e7c114d27e324f38fdd4cf42 Mon Sep 17 00:00:00 2001
From: Vasily Strelyaev <VasilyStrelyaev@users.noreply.github.com>
Date: Fri, 11 Aug 2017 17:06:19 +0300
Subject: [PATCH 6/9] Fix Alexander's remarks

---
 README.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 401dbb1..8627e32 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # testcafe-angular-selectors
 
-This plugin provides selector extensions that make it easier to test Angular applications with [TestCafe](https://github.com/DevExpress/testcafe/).
+This plugin provides selector extensions that make it easier to test Angular applications with [TestCafe](https://github.com/DevExpress/testcafe/). These extensions allow you to create a Selector to find elements on the page by **expressions** that are native to Angular applications (like `binding`, `model` etc.. ).
 
 ## Install
 
@@ -25,6 +25,8 @@ test('add new item', async t => {
 });
 ```
 
+See more examples [here](/test/angular1-test.js).
+
 ## Angular1 Selector extensions
 
 ### byBinding
@@ -92,4 +94,4 @@ parentSelector&#160;*(optional)*  | A TestCafe [selector](https://devexpress.git
              
 
 ## Angular2 Selector extensions
-Angular2 component selectors is coming...
\ No newline at end of file
+Angular2 component selectors is coming...

From c57a565c6089cd7edc3eb022ec8144d537c36af1 Mon Sep 17 00:00:00 2001
From: Vasily Strelyaev <VasilyStrelyaev@users.noreply.github.com>
Date: Fri, 11 Aug 2017 17:10:38 +0300
Subject: [PATCH 7/9] Fix one more remark

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8627e32..da90362 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ Parameter                   | Description
 expression                        |  The JavaScript expression to which the element's `textContent` is bound.
 parentSelector&#160;*(optional)*  | A TestCafe [selector](https://devexpress.github.io/testcafe/documentation/test-api/selecting-page-elements/selectors.html). If specified, TestCafe will search for the target element among the descendants of the element identified by this selector.
 
-NOTE: we don't support a deprecated syntax `Angular1Selector.byBinding('{{person.name}}')`
+> We don't support deprecated syntax `Angular1Selector.byBinding('{{person.name}}')`
 
 ### byExactBinding
 Find elements by exact binding.

From d5b0764a7ad4d976e1c3ca47716a23f070b7ba52 Mon Sep 17 00:00:00 2001
From: "miherlosev@mail.ru" <Ein7Onai>
Date: Mon, 14 Aug 2017 16:43:11 +0300
Subject: [PATCH 8/9] fix issues

---
 README.md                | 28 ++++++++++++++--------------
 package.json             |  2 +-
 src/angular1-selector.js | 36 ++++++++++++++++++------------------
 3 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/README.md b/README.md
index da90362..207c037 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ npm install testcafe-angular-selectors
 ## Usage
 
 ```js
-import { Angular1Selector1 } from 'testcafe-angular-selectors';
+import { Angular1Selector } from 'testcafe-angular-selectors';
 import { Selector } from 'testcafe';
 
 fixture `TestFixture`
@@ -19,7 +19,7 @@ fixture `TestFixture`
 
 test('add new item', async t => {
     await t
-        .typeText(Angular1Selector1.byModel('newTodo'), 'new item')
+        .typeText(Angular1Selector.byModel('newTodo'), 'new item')
         .pressKey('enter')
         .expect(Selector('#todo-list').visible).ok();
 });
@@ -32,11 +32,11 @@ See more examples [here](/test/angular1-test.js).
 ### byBinding
 Find elements by text binding. Does a partial match, so any elements bound to variables containing the input string will be returned.
 ```js
-Angular1Selector.byBinding(expression, parentSelector)
+Angular1Selector.byBinding(bindingDescriptor, parentSelector)
 ```
 Parameter                   | Description
 --------------------------- | -----------
-expression                        |  The JavaScript expression to which the element's `textContent` is bound.
+bindingDescriptor                 |  The JavaScript expression to which the element's `textContent` is bound.
 parentSelector&#160;*(optional)*  | A TestCafe [selector](https://devexpress.github.io/testcafe/documentation/test-api/selecting-page-elements/selectors.html). If specified, TestCafe will search for the target element among the descendants of the element identified by this selector.
 
 > We don't support deprecated syntax `Angular1Selector.byBinding('{{person.name}}')`
@@ -44,52 +44,52 @@ parentSelector&#160;*(optional)*  | A TestCafe [selector](https://devexpress.git
 ### byExactBinding
 Find elements by exact binding.
 ```js
-Angular1Selector.byExactBinding(expression, parentSelector)
+Angular1Selector.byExactBinding(bindingDescriptor, parentSelector)
 ```
 Parameter                   | Description
 --------------------------- | -----------
-expression                        |  The JavaScript expression to which the element's `textContent` is bound.
+bindingDescriptor                 |  The JavaScript expression to which the element's `textContent` is bound.
 parentSelector&#160;*(optional)*  | A TestCafe [selector](https://devexpress.github.io/testcafe/documentation/test-api/selecting-page-elements/selectors.html). If specified, TestCafe will search for the target element among the descendants of the element identified by this selector.
 
 ### byModel
 Find elements by 'ng-model' expression
 ```js
-Angular1Selector.byModel(expression, parentSelector)
+Angular1Selector.byModel(model, parentSelector)
 ```
 Parameter                   | Description
 --------------------------- | -----------
-expression                        | The JavaScript expression used to bind a property on the scope to an input, select, textarea (or a custom form control).
+model                             | The JavaScript expression used to bind a property on the scope to an input, select, textarea (or a custom form control).
 parentSelector&#160;*(optional)*  | A TestCafe [selector](https://devexpress.github.io/testcafe/documentation/test-api/selecting-page-elements/selectors.html). If specified, TestCafe will search for the target element among the descendants of the element identified by this selector.
 
 ### byOptions
                  
 Find elements by 'ng-options' expression.
 ```js
-Angular1Selector.byOptions(expression, parentSelector)
+Angular1Selector.byOptions(optionsDescriptor, parentSelector)
 ```
 Parameter                   | Description
 --------------------------- | -----------
-expression                        | The JavaScript expression used to generate a list of <option> elements for the <select> element.
+optionsDescriptor                 | The JavaScript expression used to generate a list of <option> elements for the <select> element.
 parentSelector&#160;*(optional)*  | A TestCafe [selector](https://devexpress.github.io/testcafe/documentation/test-api/selecting-page-elements/selectors.html). If specified, TestCafe will search for the target element among the descendants of the element identified by this selector.
 
 ### byRepeater
 Find elements by repeater. Does a partial match, so any elements bound to variables containing the input string will be returned.
 ```js
-Angular1Selector.byRepeater(expression, parentSelector)
+Angular1Selector.byRepeater(repeatDescriptor, parentSelector)
 ```
 Parameter                   | Description
 --------------------------- | -----------
-expression                        | The JavaScript expression used to instantiate a template.
+repeatDescriptor                  | The JavaScript expression used to instantiate a template.
 parentSelector&#160;*(optional)*  | A TestCafe [selector](https://devexpress.github.io/testcafe/documentation/test-api/selecting-page-elements/selectors.html). If specified, TestCafe will search for the target element among the descendants of the element identified by this selector.
 
 ### byExactRepeat
 Find elements by exact repeater.
 ```js
-Angular1Selector.byExactRepeat(expression, parentSelector)
+Angular1Selector.byExactRepeater(repeatDescriptor, parentSelector)
 ```
 Parameter                   | Description
 --------------------------- | -----------
-expression                        | The JavaScript expression used to instantiate a template.
+repeatDescriptor                  | The JavaScript expression used to instantiate a template.
 parentSelector&#160;*(optional)*  | A TestCafe [selector](https://devexpress.github.io/testcafe/documentation/test-api/selecting-page-elements/selectors.html). If specified, TestCafe will search for the target element among the descendants of the element identified by this selector.
              
 
diff --git a/package.json b/package.json
index e1e5b47..9dafc66 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "testcafe-angular-selectors",
-  "version": "0.0.1",
+  "version": "0.1.0",
   "scripts": {
     "lint": "eslint src/*.js test/*.js",
     "http-server": "http-server ./ -s",
diff --git a/src/angular1-selector.js b/src/angular1-selector.js
index e206391..a0c67fe 100644
--- a/src/angular1-selector.js
+++ b/src/angular1-selector.js
@@ -82,58 +82,58 @@ class Angular1Selector {
             throw new Error(`"${paramShortDescription}" parameter should be a non-empty string`);
     }
 
-    byBinding (expression, parentSelector) {
+    byBinding (bindingDescriptor, parentSelector) {
         this._assertNonEmptyStringParameter({
             paramShortDescription: 'Binding expression',
-            paramValue:            expression
+            paramValue:            bindingDescriptor
         });
 
-        return this._findByBinding(expression, parentSelector);
+        return this._findByBinding(bindingDescriptor, parentSelector);
     }
 
-    byExactBinding (expression, parentSelector) {
+    byExactBinding (bindingDescriptor, parentSelector) {
         this._assertNonEmptyStringParameter({
             paramShortDescription: 'Binding expression',
-            paramValue:            expression
+            paramValue:            bindingDescriptor
         });
 
-        return this._findByBinding(expression, parentSelector, true);
+        return this._findByBinding(bindingDescriptor, parentSelector, true);
     }
 
-    byModel (expression, parentSelector) {
+    byModel (model, parentSelector) {
         this._assertNonEmptyStringParameter({
             paramShortDescription: 'Model expression',
-            paramValue:            expression
+            paramValue:            model
         });
 
-        return this._findByAngularAttr('model', expression, parentSelector, true);
+        return this._findByAngularAttr('model', model, parentSelector, true);
     }
 
-    byOptions (expression, parentSelector) {
+    byOptions (optionsDescriptor, parentSelector) {
         this._assertNonEmptyStringParameter({
             paramShortDescription: 'Options expression',
-            paramValue:            expression
+            paramValue:            optionsDescriptor
         });
 
-        return this._findByAngularAttr('options', expression, parentSelector, true);
+        return this._findByAngularAttr('options', optionsDescriptor, parentSelector, true);
     }
 
-    byRepeater (expression, parentSelector) {
+    byRepeater (repeatDescriptor, parentSelector) {
         this._assertNonEmptyStringParameter({
             paramShortDescription: 'Repeat expression',
-            paramValue:            expression
+            paramValue:            repeatDescriptor
         });
 
-        return this._findByAngularAttr('repeat', expression, parentSelector);
+        return this._findByAngularAttr('repeat', repeatDescriptor, parentSelector);
     }
 
-    byExactRepeater (expression, parentSelector) {
+    byExactRepeater (repeatDescriptor, parentSelector) {
         this._assertNonEmptyStringParameter({
             paramShortDescription: 'Repeat expression',
-            paramValue:            expression
+            paramValue:            repeatDescriptor
         });
 
-        return this._findByAngularAttr('repeat', expression, parentSelector, true);
+        return this._findByAngularAttr('repeat', repeatDescriptor, parentSelector, true);
     }
 }
 

From e8f5e5a9e7f426f6cc785918c99dc91192aad61f Mon Sep 17 00:00:00 2001
From: "miherlosev@mail.ru" <Ein7Onai>
Date: Mon, 14 Aug 2017 17:43:45 +0300
Subject: [PATCH 9/9] small remark

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 207c037..8be94cb 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # testcafe-angular-selectors
 
-This plugin provides selector extensions that make it easier to test Angular applications with [TestCafe](https://github.com/DevExpress/testcafe/). These extensions allow you to create a Selector to find elements on the page by **expressions** that are native to Angular applications (like `binding`, `model` etc.. ).
+This plugin provides selector extensions that make it easier to test Angular applications with [TestCafe](https://github.com/DevExpress/testcafe/). These extensions allow you to create a Selector to find elements on the page in a way that is native to Angular applications (like `binding`, `model` etc.. ).
 
 ## Install