Skip to content
This repository has been archived by the owner on Jan 3, 2019. It is now read-only.

Commit

Permalink
pre-release 1.1.0 resolves #5 #6 #7 #8
Browse files Browse the repository at this point in the history
  • Loading branch information
Stewan Pacheco committed May 24, 2015
1 parent 3aa7134 commit 14ed372
Show file tree
Hide file tree
Showing 85 changed files with 7,635 additions and 942 deletions.
3 changes: 3 additions & 0 deletions .bowerrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"directory": "bower_components"
}
13 changes: 6 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
node_modules
bower_components
dist
src/example/_partials/*.html
.tmp
.sass-cache
*.log
node_modules/
bower_components/
.sass-cache/
.tmp/
dist/
*.sublime-project
43 changes: 43 additions & 0 deletions .jshintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
{
"node": true,
"esnext": true,
"camelcase": false,
"curly": false,
"latedef": false,
"quotmark": false,
"undef": false,
"sub":true,
"asi": true,
"globalstrict": true,
"bitwise": true,
"eqeqeq": false,
"immed": true,
"indent": 2,
"newcap": true,
"noarg": true,
"regexp": true,
"unused": true,
"strict": true,
"trailing": true,
"smarttabs": true,
"white": true,
"validthis": true,
"globals": {
"window":false,
"angular": false,
// Angular Mocks
"inject": false,
"module": false,
// JASMINE
"describe": false,
"it": false,
"before": false,
"beforeEach": false,
"after": false,
"afterEach": false,
"expect": false
}
}



107 changes: 0 additions & 107 deletions README.md

This file was deleted.

64 changes: 33 additions & 31 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,32 +1,34 @@
{
"name": "angular-morris-chart",
"main": "src/angular-morris-chart.min.js",
"version": "1.0.2",
"authors": [
"Stewan Pacheco <talk@stpa.co>"
],
"description": "Wrapper of morris.js for AngularJS",
"keywords": [
"angular",
"morris",
"chart"
],
"license": "MIT",
"homepage": "https://angular-morris-chart.stpa.co",
"private": false,
"dependencies": {
"angular": "1.3.x",
"morris.js": "~0.5.1"
},
"devDependencies": {
"moment": "~2.8.4",
"bootstrap": "~3.3.1"
},
"ignore": [
"**/.*",
"node_modules",
"bower_components",
"test",
"tests"
]
}
"name": "angular-morris-chart",
"main": "src/angular-morris-chart.min.js",
"version": "1.0.2",
"authors": [
"Stewan Pacheco <talk@stpa.co>"
],
"description": "Wrapper of morris.js for AngularJS",
"keywords": [
"angular",
"morris",
"chart"
],
"license": "MIT",
"homepage": "https://angular-morris-chart.stpa.co",
"private": false,
"dependencies": {
"angular": "1.3.x",
"morris.js": "0.5.x"
},
"devDependencies": {
"moment": "~2.8.4",
"bootstrap": "~3.3.1",
"highlightjs": "~8.5.0",
"angular-mocks": "~1.3.15"
},
"ignore": [
"**/.*",
"node_modules",
"bower_components",
"test",
"tests"
]
}
5 changes: 0 additions & 5 deletions build.sh

This file was deleted.

10 changes: 10 additions & 0 deletions e2e/.jshintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"extends": "../.jshintrc",
"globals": {
"browser": false,
"element": false,
"by": false,
"$": false,
"$$": false
}
}
15 changes: 15 additions & 0 deletions e2e/main.po.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/**
* This file uses the Page Object pattern to define the main page for tests
* https://docs.google.com/presentation/d/1B6manhG0zEXkC-H-tPo2vwU06JhL8w9-XCF9oehXzAQ
*/

'use strict';

var MainPage = function() {
this.jumbEl = element(by.css('.jumbotron'));
this.h1El = this.jumbEl.element(by.css('h1'));
this.imgEl = this.jumbEl.element(by.css('img'));
this.thumbnailEls = element(by.css('body')).all(by.repeater('awesomeThing in awesomeThings'));
};

module.exports = new MainPage();
21 changes: 21 additions & 0 deletions e2e/main.spec.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
'use strict';

describe('The main view', function () {
var page;

beforeEach(function () {
browser.get('http://localhost:3000/index.html');
page = require('./main.po');
});

it('should include jumbotron with correct data', function() {
expect(page.h1El.getText()).toBe('\'Allo, \'Allo!');
expect(page.imgEl.getAttribute('src')).toMatch(/assets\/images\/yeoman.png$/);
expect(page.imgEl.getAttribute('alt')).toBe('I\'m Yeoman');
});

it('list more than 5 awesome things', function () {
expect(page.thumbnailEls.count()).toBeGreaterThan(5);
});

});
4 changes: 4 additions & 0 deletions gulp/.jshintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"extends": "../.jshintrc",
"node": true
}

0 comments on commit 14ed372

Please sign in to comment.