+
+
+
@@ -68,10 +81,57 @@
+
+
+
+
+
+
+
diff --git a/package.json b/package.json
index bd24bb4..e2420ff 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
"grunt-contrib-concat": "~0.5.1",
"grunt-contrib-connect": "~0.10.1",
"grunt-contrib-copy": "~0.8.0",
- "grunt-contrib-jasmine": "~0.8.2",
+ "grunt-contrib-jasmine": "~0.9.1",
"grunt-contrib-jshint": "~0.11.1",
"grunt-contrib-less": "~1.0.1",
"grunt-contrib-uglify": "~0.9.1",
diff --git a/tests/e2e/app.e2e.js b/tests/e2e/app.e2e.js
index a6322ad..71ac762 100644
--- a/tests/e2e/app.e2e.js
+++ b/tests/e2e/app.e2e.js
@@ -7,11 +7,12 @@
* @module sn.infiniteScroll.e2e
* @author SOON_
*/
-angular.module("sn.infiniteScroll.e2e", ["sn.infiniteScroll", "ngMockE2E"])
+angular.module("sn.infiniteScroll.e2e", ["sn.infiniteScroll.demo", "ngMockE2E"])
.run([
"$httpBackend",
function ($httpBackend) {
+ $httpBackend.whenGET(/users.*/).respond(200, { items: [{ name: "Micheal Mariah" },{ name: "Ste Letha" },{ name: "Rachel Lorena" },{ name: "Annabella Abby" }], total: 10, _pagination: { total: 3, current: 1, limit: 4 }});
$httpBackend.whenGET(/partials\/.*/).passThrough();
}
diff --git a/tests/e2e/protractor.saucelabs.conf.js b/tests/e2e/protractor.saucelabs.conf.js
index 7d7d9ef..5428f8c 100644
--- a/tests/e2e/protractor.saucelabs.conf.js
+++ b/tests/e2e/protractor.saucelabs.conf.js
@@ -26,41 +26,47 @@ exports.config = {
"tunnel-identifier": process.env.TRAVIS_JOB_NUMBER,
"build": process.env.TRAVIS_BUILD_NUMBER,
"name": pkg.name + " (Chrome: Linux) Build: " + process.env.TRAVIS_BUILD_NUMBER,
- "version": "39",
- "selenium-version": "2.43.1",
- "platform": "Linux"
+ "version": "43.0",
+ "selenium-version": "2.46.0",
+ "chromedriver-version": "2.14",
+ "platform": "Windows 8.1",
+ "screenResolution": "1024x768"
}, {
"browserName": "firefox",
"tunnel-identifier": process.env.TRAVIS_JOB_NUMBER,
"build": process.env.TRAVIS_BUILD_NUMBER,
"name": pkg.name + " (FF: Linux) Build: " + process.env.TRAVIS_BUILD_NUMBER,
- "version": "34",
- "selenium-version": "2.43.1",
- "platform": "Linux"
+ "version": "39.0",
+ "selenium-version": "2.46.0",
+ "platform": "Linux",
+ "screenResolution": "1024x768"
}, {
"browserName": "safari",
"tunnel-identifier": process.env.TRAVIS_JOB_NUMBER,
"build": process.env.TRAVIS_BUILD_NUMBER,
"name": pkg.name + " (Safari: OS X 10.10) Build: " + process.env.TRAVIS_BUILD_NUMBER,
"version": "8",
- "selenium-version": "2.43.1",
- "platform": "OS X 10.10"
+ "selenium-version": "2.44.0",
+ "platform": "OS X 10.10",
+ "screenResolution": "1024x768"
}, {
"browserName": "internet explorer",
"tunnel-identifier": process.env.TRAVIS_JOB_NUMBER,
"build": process.env.TRAVIS_BUILD_NUMBER,
"name": pkg.name + " (IE11: Win 8.1) Build: " + process.env.TRAVIS_BUILD_NUMBER,
"version": "11",
- "selenium-version": "2.43.1",
- "platform": "Windows 8.1"
+ "selenium-version": "2.46.0",
+ "platform": "Windows 8.1",
+ "screenResolution": "1024x768"
}, {
"browserName": "internet explorer",
"tunnel-identifier": process.env.TRAVIS_JOB_NUMBER,
"build": process.env.TRAVIS_BUILD_NUMBER,
"name": pkg.name + " (IE10: Win 8) Build: " + process.env.TRAVIS_BUILD_NUMBER,
"version": "10",
- "selenium-version": "2.43.1",
- "platform": "Windows 8"
+ "selenium-version": "2.46.0",
+ "platform": "Windows 8",
+ "screenResolution": "1024x768"
}, {
"browserName": "chrome",
"tunnel-identifier": process.env.TRAVIS_JOB_NUMBER,
@@ -71,7 +77,8 @@ exports.config = {
"platformName": "Android",
"appiumVersion": "1.3.4",
"deviceName": "Android Emulator",
- "device-orientation": "portrait"
+ "device-orientation": "portrait",
+ "selenium-version": "2.46.0"
}, {
"browserName": "safari",
"tunnel-identifier": process.env.TRAVIS_JOB_NUMBER,
@@ -83,7 +90,8 @@ exports.config = {
"appiumVersion": "1.3.4",
"platform": "iOS",
"deviceName": "iPhone Simulator",
- "device-orientation": "portrait"
+ "device-orientation": "portrait",
+ "selenium-version": "2.46.0"
}],
// ----- More information for your tests ----
diff --git a/tests/e2e/specs/scenarios.js b/tests/e2e/specs/scenarios.js
index fad8d53..1416c6b 100644
--- a/tests/e2e/specs/scenarios.js
+++ b/tests/e2e/specs/scenarios.js
@@ -2,70 +2,50 @@
/* https://github.com/angular/protractor/blob/master/docs/getting-started.md */
-describe("myApp", function() {
+describe("sn.infiniteScroll", function() {
- describe("search", function() {
+ var scrollTo = function scrollTo (y) {
+ return "document.querySelector('.infinite-scroll').scrollTop =" + y;
+ };
- beforeEach(function(){
- browser.manage().deleteAllCookies();
- browser.get("http://127.0.0.1:8000/");
- browser.waitForAngular();
- browser.driver.sleep(2000);
- });
-
- it("should automatically redirect to / when location hash/fragment is empty", function() {
- expect(browser.getLocationAbsUrl()).toMatch("/");
- });
-
- it("should render home partial when user navigates to /", function() {
- expect(element.all(by.css("ng-view h1")).first().getText()).toContain("Search");
- });
+ beforeEach(function() {
+ browser.get("http://127.0.0.1:8000/");
+ browser.waitForAngular();
+ browser.driver.sleep(2000);
+ });
- it("should search for location", function() {
- element(by.model("location")).sendKeys("London");
- element(by.buttonText("Submit")).click();
+ it("should load more pages on scroll to bottom of list (8 items total)", function() {
- browser.driver.sleep(5000);
+ // confirm initial state
+ expect(element.all(by.repeater("user in users")).count()).toEqual(4);
- browser.driver.wait(function() {
- return browser.driver.getCurrentUrl().then(function (url) {
- return /results/.test(url);
- });
- });
- expect(browser.getLocationAbsUrl()).toMatch("/results");
- expect(element.all(by.repeater("result in results")).count()).toEqual(4);
- });
+ // 2nd page
+ browser.executeScript(scrollTo(2000));
+ browser.driver.sleep(2000);
+ expect(element.all(by.repeater("user in users")).count()).toEqual(8);
});
+ it("should load more pages on scroll to bottom of list (12 items total)", function() {
- describe("results", function() {
-
- beforeEach(function(){
- browser.get("http://127.0.0.1:8000/results");
- browser.waitForAngular();
- browser.driver.sleep(2000);
- });
+ // 3rd page
+ browser.executeScript(scrollTo(2000));
+ browser.executeScript(scrollTo(4000));
+ browser.driver.sleep(2000);
- it("should render results page view", function() {
- expect(element.all(by.css("ng-view h1")).first().getText()).toContain("Results");
- expect(element(by.css(".alert-info")).getText()).toContain("No results");
+ expect(element.all(by.repeater("user in users")).count()).toEqual(12);
- });
-
- it("should go back to search page view", function() {
- element(by.css("a.home")).click();
-
- browser.driver.wait(function() {
- return browser.driver.getCurrentUrl().then(function (url) {
- return /\//.test(url);
- });
- });
+ });
- expect(browser.getLocationAbsUrl()).toMatch("/");
+ it("should NOT load more pages on scroll to bottom of list", function() {
- });
+ // 4th page - shouldn't exist
+ browser.executeScript(scrollTo(2000));
+ browser.executeScript(scrollTo(4000));
+ browser.executeScript(scrollTo(6000));
+ browser.driver.sleep(2000);
+ expect(element.all(by.repeater("user in users")).count()).toEqual(12);
});
});