Skip to content

Commit 6a9b11c

Browse files
impalerimpaler
committed
manually merge integration test refactor.
1 parent 98fdfcb commit 6a9b11c

File tree

119 files changed

+92845
-605
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+92845
-605
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# angularity
22
![Angularity Logo](http://angularity.github.io/assets/logo.png)
33

4-
[![Build Status](https://travis-ci.org/angularity/node-angularity.svg?branch=master)](https://travis-ci.org/angularity/node-angularity)
4+
[![Build Status](https://travis-ci.org/angularity/node-angularity.svg?branch=master)](https://travis-ci.org/angularity/node-angularity) [![Build status](https://ci.appveyor.com/api/projects/status/6b1xir7y1j0wm64a/branch/master?svg=true)](https://ci.appveyor.com/project/impaler/node-angularity/branch/master)
55

66
An opinionated node.js build system for ECMAScript 6 AngularJS projects
77

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,6 @@
106106
},
107107
"devDependencies": {
108108
"jasmine-node": "latest",
109-
"jasmine-diff-matchers": "^1.0.2"
109+
"jasmine-diff-matchers": "~2.0.0"
110110
}
111111
}

‎test/cli.spec.js‎

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎test/expected/minimal-es5-unminified/.editorconfig‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[*.js]
2+
indent_style = space
3+
indent_size = 4

‎test/expected/minimal-es5-unminified/.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
/.idea
2+
npm-debug.log

‎test/expected/minimal-es5-unminified/.jshintrc‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
{
2+
"bitwise": true,
3+
"camelcase": true,
4+
"curly": true,
5+
"eqeqeq": true,
6+
"forin": false,
7+
"freeze": false,
8+
"immed": true,
9+
"indent": 2,
10+
"latedef": "nofunc",
11+
"newcap": true,
12+
"noarg": true,
13+
"noempty": true,
14+
"nonbsp": true,
15+
"nonew": true,
16+
"plusplus": false,
17+
"quotmark": "single",
18+
"undef": true,
19+
"unused": true,
20+
"strict": false,
21+
"maxparams": 20,
22+
"maxdepth": 5,
23+
"maxlen": 120,
24+
"esnext": true,
25+
"globals": {
26+
"angular": false,
27+
"module": false,
28+
"document": false,
29+
"require": false
30+
}
31+
}

‎test/expected/minimal-es5-unminified/angularity.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"name": "minimal-es5",
3+
"version": "0.0.1",
4+
"port": 61658
5+
}

‎test/expected/minimal-es5-unminified/app-build/index.css‎

Lines changed: 30 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎test/expected/minimal-es5-unminified/app-build/index.css.map‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎test/expected/minimal-es5-unminified/app-build/index.html‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<!DOCTYPE html>
2+
<html ng-app="browser-image-diff-client">
3+
<head lang="en">
4+
<!-- bower:css -->
5+
<!-- endinject -->
6+
<!-- inject:css -->
7+
<link rel="stylesheet" href="/app-build/index.css">
8+
<!-- endinject -->
9+
</head>
10+
<body>
11+
<ui-view></ui-view>
12+
<!-- bower:js -->
13+
<script src="/bower_components/jquery/dist/jquery.js"></script>
14+
<script src="/bower_components/angular/angular.js"></script>
15+
<script src="/bower_components/angular-ui-router/release/angular-ui-router.js"></script>
16+
<script src="/bower_components/angular-mocks/angular-mocks.js"></script>
17+
<!-- endinject -->
18+
<!-- inject:js -->
19+
<script src="/app-build/index.js"></script>
20+
<!-- endinject -->
21+
</body>
22+
</html>

0 commit comments

Comments
 (0)