diff --git a/example/personalLog/personalLog.html b/example/personalLog/personalLog.html index 64a6115d..6915b9a0 100644 --- a/example/personalLog/personalLog.html +++ b/example/personalLog/personalLog.html @@ -6,8 +6,10 @@ - - + + +
@@ -20,7 +22,7 @@ diff --git a/example/personalLog/personalLog.js b/example/personalLog/personalLog.js index da946a6f..acaf371e 100644 --- a/example/personalLog/personalLog.js +++ b/example/personalLog/personalLog.js @@ -51,10 +51,10 @@ function LogCtrl($cookieStore) { /** * Persistently removes a log from logs. - * @param {number} msgIdx Index of the log to remove. + * @param {object} log The log to remove. */ - this.rmLog = function(msgIdx) { - logs.splice(msgIdx,1); + this.rmLog = function(log) { + angular.Array.remove(logs, log); $cookieStore.put(LOGS, logs); }; diff --git a/example/personalLog/scenario/personalLogScenario.js b/example/personalLog/scenario/personalLogScenario.js new file mode 100644 index 00000000..3679a33c --- /dev/null +++ b/example/personalLog/scenario/personalLogScenario.js @@ -0,0 +1,98 @@ +describe('personal log', function() { + + beforeEach(function() { + navigateTo('../personalLog.html'); + }); + + + afterEach(function() { + clearCookies(); + }); + + + it('should create new logs and order them in reverse chronological order', function(){ + //create first msg + input('newMsg').enter('my first message'); + element('form input[type="submit"]').click(); + + expect(repeater('ul li').count()).toEqual(1); + expect(repeater('ul li').column('log.msg')).toEqual('my first message'); + + //create second msg + input('newMsg').enter('my second message'); + element('form input[type="submit"]').click(); + + expect(repeater('ul li').count()).toEqual(2); + expect(repeater('ul li').column('log.msg')).toEqual(['my second message', 'my first message']); + }); + + + it('should delete a log when user clicks on the related X link', function() { + //create first msg + input('newMsg').enter('my first message'); + element('form input[type="submit"]').click(); + //create second msg + input('newMsg').enter('my second message'); + element('form input[type="submit"]').click(); + expect(repeater('ul li').count()).toEqual(2); + + element('ul li a:eq(1)').click(); + expect(repeater('ul li').count()).toEqual(1); + expect(repeater('ul li').column('log.msg')).toEqual('my second message'); + + element('ul li a:eq(0)').click(); + expect(repeater('ul li').count()).toEqual(0); + }); + + + it('should delete all cookies when user clicks on "remove all" button', function() { + //create first msg + input('newMsg').enter('my first message'); + element('form input[type="submit"]').click(); + //create second msg + input('newMsg').enter('my second message'); + element('form input[type="submit"]').click(); + expect(repeater('ul li').count()).toEqual(2); + + element('input[value="remove all"]').click(); + expect(repeater('ul li').count()).toEqual(0); + }); + + + it('should preserve logs over page reloads', function() { + input('newMsg').enter('my persistent message'); + element('form input[type="submit"]').click(); + expect(repeater('ul li').count()).toEqual(1); + + navigateTo('about:blank'); + navigateTo('../personalLog.html'); + + expect(repeater('ul li').column('log.msg')).toEqual('my persistent message'); + expect(repeater('ul li').count()).toEqual(1); + }); +}); + + +/** + * DSL for deleting all cookies. + */ +angular.scenario.dsl('clearCookies', function() { + /** + * Deletes cookies by interacting with the cookie service within the application under test. + */ + return function() { + this.addFutureAction('clear all cookies', function($window, $document, done) { + //TODO: accessing angular services is pretty nasty, we need a better way to reach them + var $cookies = $window.$root.$cookies, + cookieName; + + for (cookieName in $cookies) { + console.log('deleting cookie: ' + cookieName); + delete $cookies[cookieName]; + } + $window.$root.$eval(); + + done(); + }); + }; +}); diff --git a/example/personalLog/scenario/runner.html b/example/personalLog/scenario/runner.html new file mode 100644 index 00000000..7129c228 --- /dev/null +++ b/example/personalLog/scenario/runner.html @@ -0,0 +1,10 @@ + + + + Personal Log Scenario Runner + + + + + + diff --git a/example/personalLog/test/personalLogSpec.js b/example/personalLog/test/personalLogSpec.js index f111aba4..d3df1b64 100644 --- a/example/personalLog/test/personalLogSpec.js +++ b/example/personalLog/test/personalLogSpec.js @@ -72,10 +72,10 @@ describe('example.personalLog.LogCtrl', function() { it('should delete a message identified by index', function() { - logCtrl.rmLog(1); + logCtrl.rmLog(logCtrl.logs[1]); expect(logCtrl.logs.length).toBe(3); - logCtrl.rmLog(2); + logCtrl.rmLog(logCtrl.logs[2]); expect(logCtrl.logs.length).toBe(2); expect(logCtrl.logs[0].msg).toBe('message1'); expect(logCtrl.logs[1].msg).toBe('message3'); @@ -85,12 +85,12 @@ describe('example.personalLog.LogCtrl', function() { it('should update cookies when a log is deleted', function() { expect(logCtrl.$cookies.logs).toMatch(/\[\{.*?\}(,\{.*?\}){3}\]/); - logCtrl.rmLog(1); + logCtrl.rmLog(logCtrl.logs[1]); expect(logCtrl.$cookies.logs).toMatch(/\[\{.*?\}(,\{.*?\}){2}\]/); - logCtrl.rmLog(0); - logCtrl.rmLog(0); - logCtrl.rmLog(0); + logCtrl.rmLog(logCtrl.logs[0]); + logCtrl.rmLog(logCtrl.logs[0]); + logCtrl.rmLog(logCtrl.logs[0]); expect(logCtrl.$cookies.logs).toMatch(/\[\]/); }); });