Skip to content

chore(gen:bower): update angular deps #1061

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

chore(gen:bower): update angular deps #1061

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e2c20a5
chore(gen:bower): update angular deps
Awk34 Jul 14, 2015
ca29587
Merge branch 'canary' of https://github.com/DaftMonk/generator-angula…
Awk34 Jul 17, 2015
121efb4
fix(app:tests): update protractor test for angular 1.4
kingcody Jul 22, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions app/templates/_bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
4 changes: 2 additions & 2 deletions app/templates/e2e/account(auth)/login/login.spec(jasmine).js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});

Expand All @@ -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.');
Expand Down
4 changes: 2 additions & 2 deletions app/templates/e2e/account(auth)/login/login.spec(mocha).js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});

Expand All @@ -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.');
Expand Down
4 changes: 2 additions & 2 deletions app/templates/e2e/account(auth)/logout/logout.spec(jasmine).js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});

Expand Down
4 changes: 2 additions & 2 deletions app/templates/e2e/account(auth)/logout/logout.spec(mocha).js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});

Expand Down
5 changes: 3 additions & 2 deletions app/templates/e2e/account(auth)/signup/signup.spec(jasmine).js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ describe('Signup View', function() {
var page;

var loadPage = function() {
browser.manage().deleteAllCookies();
browser.get('/signup');
page = require('./signup.po');
};
Expand Down Expand Up @@ -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();
Expand All @@ -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'));
Expand Down
11 changes: 7 additions & 4 deletions app/templates/e2e/account(auth)/signup/signup.spec(mocha).js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down Expand Up @@ -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();
Expand All @@ -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'));
Expand Down
2 changes: 1 addition & 1 deletion app/templates/e2e/components/navbar/navbar.po.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();