diff --git a/app/templates/_bower.json b/app/templates/_bower.json index e8c239de2..5798b8a73 100644 --- a/app/templates/_bower.json +++ b/app/templates/_bower.json @@ -2,23 +2,23 @@ "name": "<%= _.slugify(_.humanize(appname)) %>", "version": "0.0.0", "dependencies": { - "angular": "~1.2", + "angular": "~1.4.0", "json3": "~3.3.1", "es5-shim": "~3.0.1",<% if(filters.bootstrap) { %><% if (filters.sass) { %> "bootstrap-sass-official": "~3.1.1",<% } %> "bootstrap": "~3.1.1",<% } %> - "angular-resource": "~1.2", - "angular-cookies": "~1.2", - "angular-sanitize": "~1.2",<% if (filters.ngroute) { %> - "angular-route": "~1.2",<% } %><% if (filters.uibootstrap) { %> - "angular-bootstrap": "~0.11.0",<% } %> + "angular-resource": "~1.4.0", + "angular-cookies": "~1.4.0", + "angular-sanitize": "~1.4.0",<% if (filters.ngroute) { %> + "angular-route": "~1.4.0",<% } %><% if (filters.uibootstrap) { %> + "angular-bootstrap": "~0.13.0",<% } %> "font-awesome": ">=4.1.0", "lodash": "~2.4.1"<% if(filters.socketio) { %>, - "angular-socket-io": "~0.6.0"<% } %><% if(filters.uirouter) { %>, + "angular-socket-io": "~0.7.0"<% } %><% if(filters.uirouter) { %>, "angular-ui-router": "~0.2.15"<% } %> }, "devDependencies": { - "angular-mocks": "~1.2", - "angular-scenario": "~1.2" + "angular-mocks": "~1.4.0", + "angular-scenario": "~1.4.0" } } diff --git a/app/templates/e2e/account(auth)/login/login.spec(jasmine).js b/app/templates/e2e/account(auth)/login/login.spec(jasmine).js index 8b31d4d6b..11186a366 100644 --- a/app/templates/e2e/account(auth)/login/login.spec(jasmine).js +++ b/app/templates/e2e/account(auth)/login/login.spec(jasmine).js @@ -45,7 +45,7 @@ describe('Login View', function() { var navbar = require('../../components/navbar/navbar.po'); - expect(browser.getLocationAbsUrl()).toBe(config.baseUrl + '/'); + expect(browser.getLocationAbsUrl()).toBe('/'); expect(navbar.navbarAccountGreeting.getText()).toBe('Hello ' + testUser.name); }); @@ -55,7 +55,7 @@ describe('Login View', function() { password: 'badPassword' }); - expect(browser.getLocationAbsUrl()).toBe(config.baseUrl + '/login'); + expect(browser.getLocationAbsUrl()).toBe('/login'); var helpBlock = page.form.element(by.css('.form-group.has-error .help-block.ng-binding')); expect(helpBlock.getText()).toBe('This password is not correct.'); diff --git a/app/templates/e2e/account(auth)/login/login.spec(mocha).js b/app/templates/e2e/account(auth)/login/login.spec(mocha).js index 57222c1e4..8125cefed 100644 --- a/app/templates/e2e/account(auth)/login/login.spec(mocha).js +++ b/app/templates/e2e/account(auth)/login/login.spec(mocha).js @@ -50,7 +50,7 @@ describe('Login View', function() { var navbar = require('../../components/navbar/navbar.po'); - <%= does("browser.getLocationAbsUrl()") %>.eventually.equal(config.baseUrl + '/'); + <%= does("browser.getLocationAbsUrl()") %>.eventually.equal('/'); <%= does("navbar.navbarAccountGreeting.getText()") %>.eventually.equal('Hello ' + testUser.name); }); @@ -65,7 +65,7 @@ describe('Login View', function() { password: 'badPassword' }); - <%= does("browser.getLocationAbsUrl()") %>.eventually.equal(config.baseUrl + '/login'); + <%= does("browser.getLocationAbsUrl()") %>.eventually.equal('/login'); var helpBlock = page.form.element(by.css('.form-group.has-error .help-block.ng-binding')); <%= does("helpBlock.getText()") %>.eventually.equal('This password is not correct.'); diff --git a/app/templates/e2e/account(auth)/logout/logout.spec(jasmine).js b/app/templates/e2e/account(auth)/logout/logout.spec(jasmine).js index fc10a1684..ba0265612 100644 --- a/app/templates/e2e/account(auth)/logout/logout.spec(jasmine).js +++ b/app/templates/e2e/account(auth)/logout/logout.spec(jasmine).js @@ -34,14 +34,14 @@ describe('Logout View', function() { it('should logout a user and redirecting to "/"', function() { var navbar = require('../../components/navbar/navbar.po'); - expect(browser.getLocationAbsUrl()).toBe(config.baseUrl + '/'); + expect(browser.getLocationAbsUrl()).toBe('/'); expect(navbar.navbarAccountGreeting.getText()).toBe('Hello ' + testUser.name); browser.get('/logout'); navbar = require('../../components/navbar/navbar.po'); - expect(browser.getLocationAbsUrl()).toBe(config.baseUrl + '/'); + expect(browser.getLocationAbsUrl()).toBe('/'); expect(navbar.navbarAccountGreeting.isDisplayed()).toBe(false); }); diff --git a/app/templates/e2e/account(auth)/logout/logout.spec(mocha).js b/app/templates/e2e/account(auth)/logout/logout.spec(mocha).js index 5268456de..746a3fb87 100644 --- a/app/templates/e2e/account(auth)/logout/logout.spec(mocha).js +++ b/app/templates/e2e/account(auth)/logout/logout.spec(mocha).js @@ -39,14 +39,14 @@ describe('Logout View', function() { it('should logout a user and redirecting to "/"', function() { var navbar = require('../../components/navbar/navbar.po'); - <%= does("browser.getLocationAbsUrl()") %>.eventually.equal(config.baseUrl + '/'); + <%= does("browser.getLocationAbsUrl()") %>.eventually.equal('/'); <%= does("navbar.navbarAccountGreeting.getText()") %>.eventually.equal('Hello ' + testUser.name); browser.get('/logout'); navbar = require('../../components/navbar/navbar.po'); - <%= does("browser.getLocationAbsUrl()") %>.eventually.equal(config.baseUrl + '/'); + <%= does("browser.getLocationAbsUrl()") %>.eventually.equal('/'); <%= does("navbar.navbarAccountGreeting.isDisplayed()") %>.eventually.equal(false); }); diff --git a/app/templates/e2e/account(auth)/signup/signup.spec(jasmine).js b/app/templates/e2e/account(auth)/signup/signup.spec(jasmine).js index 1613d3ae8..f1d33db1e 100644 --- a/app/templates/e2e/account(auth)/signup/signup.spec(jasmine).js +++ b/app/templates/e2e/account(auth)/signup/signup.spec(jasmine).js @@ -8,6 +8,7 @@ describe('Signup View', function() { var page; var loadPage = function() { + browser.manage().deleteAllCookies(); browser.get('/signup'); page = require('./signup.po'); }; @@ -42,7 +43,7 @@ describe('Signup View', function() { var navbar = require('../../components/navbar/navbar.po'); - expect(browser.getLocationAbsUrl()).toBe(config.baseUrl + '/'); + expect(browser.getLocationAbsUrl()).toBe('/'); expect(navbar.navbarAccountGreeting.getText()).toBe('Hello ' + testUser.name); done(); @@ -52,7 +53,7 @@ describe('Signup View', function() { it('should indicate signup failures', function() { page.signup(testUser); - expect(browser.getLocationAbsUrl()).toBe(config.baseUrl + '/signup'); + expect(browser.getLocationAbsUrl()).toBe('/signup'); expect(page.form.email.getAttribute('class')).toContain('ng-invalid-mongoose'); var helpBlock = page.form.element(by.css('.form-group.has-error .help-block.ng-binding')); diff --git a/app/templates/e2e/account(auth)/signup/signup.spec(mocha).js b/app/templates/e2e/account(auth)/signup/signup.spec(mocha).js index e4855cc11..62e56f9ce 100644 --- a/app/templates/e2e/account(auth)/signup/signup.spec(mocha).js +++ b/app/templates/e2e/account(auth)/signup/signup.spec(mocha).js @@ -8,8 +8,11 @@ describe('Signup View', function() { var page; var loadPage = function() { - browser.get('/signup'); - page = require('./signup.po'); + return browser.manage().deleteAllCookies() + .then(function() { + browser.get('/signup'); + page = require('./signup.po'); + }); }; var testUser = { @@ -47,7 +50,7 @@ describe('Signup View', function() { var navbar = require('../../components/navbar/navbar.po'); - <%= does("browser.getLocationAbsUrl()") %>.eventually.equal(config.baseUrl + '/'); + <%= does("browser.getLocationAbsUrl()") %>.eventually.equal('/'); <%= does("navbar.navbarAccountGreeting.getText()") %>.eventually.equal('Hello ' + testUser.name); done(); @@ -62,7 +65,7 @@ describe('Signup View', function() { it('should indicate signup failures', function() { page.signup(testUser); - <%= does("browser.getLocationAbsUrl()") %>.eventually.equal(config.baseUrl + '/signup'); + <%= does("browser.getLocationAbsUrl()") %>.eventually.equal('/signup'); <%= does("page.form.email.getAttribute('class')") %>.eventually.contain('ng-invalid-mongoose'); var helpBlock = page.form.element(by.css('.form-group.has-error .help-block.ng-binding')); diff --git a/app/templates/e2e/components/navbar/navbar.po.js b/app/templates/e2e/components/navbar/navbar.po.js index 62f407210..80a48418e 100644 --- a/app/templates/e2e/components/navbar/navbar.po.js +++ b/app/templates/e2e/components/navbar/navbar.po.js @@ -10,7 +10,7 @@ var NavbarComponent = function() { this.navbarHeader = this.navbar.element(by.css('.navbar-header')); this.navbarNav = this.navbar.element(by.css('#navbar-main .nav.navbar-nav:not(.navbar-right)'));<% if (filters.auth) { %> this.navbarAccount = this.navbar.element(by.css('#navbar-main .nav.navbar-nav.navbar-right')); - this.navbarAccountGreeting = this.navbarAccount.element(by.binding('Hello {{ getCurrentUser().name }}'));<% } %> + this.navbarAccountGreeting = this.navbarAccount.element(by.binding('getCurrentUser().name'));<% } %> }; module.exports = new NavbarComponent();