Skip to content
This repository was archived by the owner on Apr 25, 2023. It is now read-only.

Commit e89e841

Browse files
author
Mateu Aguiló Bosch
committed
Use oficial angular repos for Bower dependencies, and PhantomJS.
1 parent 5347a17 commit e89e841

File tree

5 files changed

+32
-30
lines changed

5 files changed

+32
-30
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
KARMA = ./node_modules/karma/bin/karma start test/karma.conf.js --browsers Firefox --single-run
1+
KARMA = ./node_modules/karma/bin/karma start test/karma.conf.js --browsers PhantomJS --single-run
22

33
install:; @npm install
44

‎bower.json‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
{
2-
"name" : "message-center",
3-
"version" : "1.0.0",
4-
"description" : "AngularJS Message Center",
5-
"keywords" : [ "angular", "js", "messages", "alert", "bootstrap" ],
6-
"author" : "Mateu Aguiló Bosch <mateu.aguilo.bosch@gmail.com>",
7-
"readmeFilename" : "README.md",
8-
"dependencies" : {
9-
"angular" : "~1.2.0"
2+
"name" : "message-center",
3+
"version" : "1.0.0",
4+
"description" : "AngularJS Message Center",
5+
"keywords" : [ "angular", "js", "messages", "alert", "bootstrap" ],
6+
"author" : "Mateu Aguiló Bosch <mateu.aguilo.bosch@gmail.com>",
7+
"readmeFilename" : "README.md",
8+
"dependencies" : {
9+
"angular" : "~1.2.0",
10+
"angular-route" : "~1.2.0",
11+
"angular-mocks" : "~1.2.0"
1012
},
11-
"ignore" : [ "**/.*", "node_modules", "test" ]
13+
"ignore" : [ "**/.*", "node_modules", "test" ]
1214
}

‎test/app/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html>
33
<head>
44
<script src="components/angular/angular.js"></script>
5-
<script src="components/angular/angular-route.js"></script>
5+
<script src="components/angular-route/angular-route.js"></script>
66
<script src="message-center.js"></script>
77
<script>
88
angular.module('messageCenter.e2e', ['MessageCenterModule', 'ngRoute'])

‎test/karma.conf.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ module.exports = function(config) { config.set({
66
urlRoot : '/_karma_/',
77
frameworks : ['ng-scenario', 'mocha'],
88
files : [
9-
'app/components/angular/angular-mocks.js',
9+
'app/components/angular-mocks/angular-mocks.js',
1010
'scenarios.js'
1111
],
1212
reporters : ['dots'],
1313
logLevel : config.LOG_ERROR,
1414

15-
browsers : ['Firefox'],
15+
browsers : ['PhantomJS'],
1616
captureTimeout: 10000
1717
});};

‎test/scenarios.js‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,35 +16,35 @@ describe('Message Center', function() {
1616
element('#saveSuccess').click();
1717
var messages = element('div#mc-messages-wrapper .alert');
1818
expect(messages.count()).toBe(1);
19-
expect(messages.prop('className')).toEqual('alert fade in alert-success');
19+
expect(messages.prop('className')).toEqual('alert alert-success fade in');
2020
expect(messages.text()).toMatch('Saved successfully!');
2121
});
2222

2323
it('renders a message with the level and text provided', function() {
2424
element('#saveFailure').click();
2525
var messages = element('div#mc-messages-wrapper .alert');
2626
expect(messages.count()).toBe(1);
27-
expect(messages.prop('className')).toEqual('alert fade in alert-danger');
27+
expect(messages.prop('className')).toEqual('alert alert-danger fade in');
2828
expect(messages.text()).toMatch('Something went wrong!');
2929
});
3030

3131
it('renders multiple messages with the default "success" level and text', function() {
3232
element('#saveMultipleSuccess').click();
3333
var yay = element('div#mc-messages-wrapper .alert:first');
34-
expect(yay.prop('className')).toEqual('alert fade in alert-success');
34+
expect(yay.prop('className')).toEqual('alert alert-success fade in');
3535
expect(yay.text()).toMatch('Yay!');
3636
var saved = element('div#mc-messages-wrapper .alert:nth-of-type(2)');
37-
expect(saved.prop('className')).toEqual('alert fade in alert-success');
37+
expect(saved.prop('className')).toEqual('alert alert-success fade in');
3838
expect(saved.text()).toMatch('Saved successfully!');
3939
});
4040

4141
it('renders multiple messages with the level and text provided', function() {
4242
element('#saveMultipleTypes').click();
4343
var yay = element('div#mc-messages-wrapper .alert:first');
44-
expect(yay.prop('className')).toEqual('alert fade in alert-success');
44+
expect(yay.prop('className')).toEqual('alert alert-success fade in');
4545
expect(yay.text()).toMatch('Yay!');
4646
var somethingWrong = element('div#mc-messages-wrapper .alert:nth-of-type(2)');
47-
expect(somethingWrong.prop('className')).toEqual('alert fade in alert-danger');
47+
expect(somethingWrong.prop('className')).toEqual('alert alert-danger fade in');
4848
expect(somethingWrong.text()).toMatch('Something went wrong!');
4949
});
5050
});
@@ -55,35 +55,35 @@ describe('Message Center', function() {
5555
element('#goEditSuccess').click();
5656
var messages = element('div#mc-messages-wrapper .alert');
5757
expect(messages.count()).toBe(1);
58-
expect(messages.prop('className')).toEqual('alert fade in alert-success');
58+
expect(messages.prop('className')).toEqual('alert alert-success fade in');
5959
expect(messages.text()).toMatch('You have reached the edit page!');
6060
});
6161

6262
it('renders a message with the level and text provided', function() {
6363
element('#goEditFailure').click();
6464
var messages = element('div#mc-messages-wrapper .alert');
6565
expect(messages.count()).toBe(1);
66-
expect(messages.prop('className')).toEqual('alert fade in alert-danger');
66+
expect(messages.prop('className')).toEqual('alert alert-danger fade in');
6767
expect(messages.text()).toMatch('Something went wrong!');
6868
});
6969

7070
it('renders multiple messages with the default "success" level and text', function() {
7171
element('#goEditMultipleSuccess').click();
7272
var yay = element('div#mc-messages-wrapper .alert:first');
73-
expect(yay.prop('className')).toEqual('alert fade in alert-success');
73+
expect(yay.prop('className')).toEqual('alert alert-success fade in');
7474
expect(yay.text()).toMatch('Yay!');
7575
var youveReached = element('div#mc-messages-wrapper .alert:nth-of-type(2)');
76-
expect(youveReached.prop('className')).toEqual('alert fade in alert-success');
76+
expect(youveReached.prop('className')).toEqual('alert alert-success fade in');
7777
expect(youveReached.text()).toMatch('You have reached the edit page!');
7878
});
7979

8080
it('renders multiple messages with the level and text provided', function() {
8181
element('#goEditMultipleTypes').click();
8282
var yay = element('div#mc-messages-wrapper .alert:first');
83-
expect(yay.prop('className')).toEqual('alert fade in alert-success');
83+
expect(yay.prop('className')).toEqual('alert alert-success fade in');
8484
expect(yay.text()).toMatch('Yay!');
8585
var somethingWrong = element('div#mc-messages-wrapper .alert:nth-of-type(2)');
86-
expect(somethingWrong.prop('className')).toEqual('alert fade in alert-danger');
86+
expect(somethingWrong.prop('className')).toEqual('alert alert-danger fade in');
8787
expect(somethingWrong.text()).toMatch('Something went wrong!');
8888
});
8989
});
@@ -95,31 +95,31 @@ describe('Message Center', function() {
9595
it('still renders a permanent message', function () {
9696
var messages = element('div#mc-messages-wrapper .alert');
9797
expect(messages.count()).toBe(1);
98-
expect(messages.prop('className')).toEqual('alert fade in alert-success');
98+
expect(messages.prop('className')).toEqual('alert alert-success fade in');
9999
expect(messages.text()).toMatch('Showing permanent message!');
100100
element('#goIndex').click();
101101
element('#goPermanent').click();
102102
element('#goIndex').click();
103103
messages = element('div#mc-messages-wrapper .alert');
104104
expect(messages.count()).toBe(2);
105105
var message = element('div#mc-messages-wrapper .alert:first');
106-
expect(message.prop('className')).toEqual('alert fade in alert-success');
106+
expect(message.prop('className')).toEqual('alert alert-success fade in');
107107
expect(message.text()).toMatch('Showing permanent message!');
108108
messages = element('div#mc-messages-wrapper .alert');
109109
message = element('div#mc-messages-wrapper .alert:nth-of-type(2)');
110110
expect(messages.count()).toBe(2);
111-
expect(message.prop('className')).toEqual('alert fade in alert-success');
111+
expect(message.prop('className')).toEqual('alert alert-success fade in');
112112
expect(message.text()).toMatch('Showing permanent message!');
113113
});
114114
it('renders a permanent message and then closes it', function () {
115115
var messages = element('div#mc-messages-wrapper .alert');
116116
expect(messages.count()).toBe(1);
117-
expect(messages.prop('className')).toEqual('alert fade in alert-success');
117+
expect(messages.prop('className')).toEqual('alert alert-success fade in');
118118
expect(messages.text()).toMatch('Showing permanent message!');
119119
element('#goIndex').click();
120120
messages = element('div#mc-messages-wrapper .alert');
121121
expect(messages.count()).toBe(1);
122-
expect(messages.prop('className')).toEqual('alert fade in alert-success');
122+
expect(messages.prop('className')).toEqual('alert alert-success fade in');
123123
expect(messages.text()).toMatch('Showing permanent message!');
124124
element('div#mc-messages-wrapper .alert .close').click();
125125
messages = element('div#mc-messages-wrapper .alert');

0 commit comments

Comments
 (0)