Merge branch 'ngforward' of softwarepublico.gov.br:noosfero-themes/angular-theme into ngforward

Victor Costa
2 parents 65a72194 50a53289
Showing 8 changed files with 198 additions and 72 deletions Show diff stats
karma-webpack.conf.js
karma.conf.js
package.json
src/app/components/noosfero-articles/article/article.directive.spec.ts
src/app/index.ts
src/spec.ts
tsconfig.json
webpack.config.js
@@ -0,0 +1,130 @@
+/* global process, */
+'use strict';
+
+var path = require('path');
+var conf = require('./gulp/conf');
+
+
+var _ = require('lodash');
+var wiredep = require('wiredep');
+
+var pathSrcHtml = [
+    path.join(conf.paths.src, '/**/*.html')
+];
+
+function listFiles() {
+    var wiredepOptions = _.extend({}, conf.wiredep, {
+        dependencies: true,
+        devDependencies: true
+    });
+
+    var patterns = [].concat(wiredep(wiredepOptions).js)
+        .concat([
+            './src/spec.ts'
+            ]
+        )
+        .concat(pathSrcHtml);
+
+    var files = patterns.map(function (pattern) {
+        return {
+            pattern: pattern
+        };
+    });
+    files.push({
+        pattern: path.join(conf.paths.src, '/assets/**/*'),
+        included: false,
+        served: true,
+        watched: false
+    });
+    return files;
+}
+
+var webpackConfig = require("./webpack.config.js");
+
+module.exports = function (config) {
+
+    var configuration = {
+        files: listFiles(),
+
+        singleRun: false,
+
+        autoWatch: true,
+        colors: true,
+
+        logLevel: config.LOG_INFO,
+
+        ngHtml2JsPreprocessor: {
+            stripPrefix: conf.paths.src + '/',
+            moduleName: 'angular'
+        },
+
+
+        frameworks: ['jasmine', 'phantomjs-shim'],//, 'angular-filesort'],
+
+        angularFilesort: {
+            whitelist: [path.join(conf.paths.src, '/**/!(*.html|*.spec|*.mock).js')]
+        },
+
+        browsers: ['PhantomJS'],
+
+        webpack: _.merge({
+            
+        }, webpackConfig, {
+            devtool: 'inline-source-map'
+        }),
+        webpackServer: {
+            quite: true
+        },
+        plugins: [
+            'karma-chrome-launcher',
+            'karma-phantomjs-launcher',
+            'karma-angular-filesort',
+            'karma-webpack',
+            'karma-phantomjs-shim',
+            'karma-coverage',
+            'karma-jasmine',
+            'karma-spec-reporter',
+            'karma-ng-html2js-preprocessor',
+            'karma-sourcemap-loader'
+        ],
+
+        coverageReporter: {
+            type: 'html',
+            dir: 'coverage/'
+        },
+
+        reporters: ['spec', "coverage"],
+
+        proxies: {
+            '/assets/': path.join('/base/', conf.paths.src, '/assets/')
+        }
+    };
+
+    // This is the default preprocessors configuration for a usage with Karma cli
+    // The coverage preprocessor is added in gulp/unit-test.js only for single tests
+    // It was not possible to do it there because karma doesn't let us now if we are
+    // running a single test or not
+     configuration.preprocessors = {
+         'src/**/*.ts': ['webpack','sourcemap']
+     };
+
+    pathSrcHtml.forEach(function (path) {
+        configuration.preprocessors[path] = ['ng-html2js'];
+    });
+
+    // This block is needed to execute Chrome on Travis
+    // If you ever plan to use Chrome and Travis, you can keep it
+    // If not, you can safely remove it
+    // https://github.com/karma-runner/karma/issues/1144#issuecomment-53633076
+    if (configuration.browsers[0] === 'Chrome' && process.env.TRAVIS) {
+        configuration.customLaunchers = {
+            'chrome-travis-ci': {
+                base: 'Chrome',
+                flags: ['--no-sandbox']
+            }
+        };
+        configuration.browsers = ['chrome-travis-ci'];
+    }
+
+    config.set(configuration);
+};
@@ -12,6 +12,9 @@ var pathSrcHtml = [
     path.join(conf.paths.src, '/**/*.html')
 ];
+var glob = require("glob");
+var testFiles = glob.sync("./src/**/*.[sS]pec.ts");
+
 function listFiles() {
     var wiredepOptions = _.extend({}, conf.wiredep, {
         dependencies: true,
@@ -20,15 +23,21 @@ function listFiles() {
     var patterns = [].concat(wiredep(wiredepOptions).js)
         .concat([
+            './src/commons.js',
+            './src/noosfero.js',
+            './src/noosfero-specs.js'
+            ]
+            //[
              //path.join(conf.paths.src, 'common.js'),
              //, path.join(conf.paths.src, 'index.ts')
-             path.join(conf.paths.src, 'test.js')
+             //path.join(conf.paths.src, 'test.js')
             // path.join(conf.paths.src, '/app/**/*.module.js'),
             // path.join(conf.paths.src, '/app/**/*.js'),
             // path.join(conf.paths.src, '/**/*.spec.js'),
             // path.join(conf.paths.src, '/**/*.mock.js')
-        ])
+        //]
+        )
         .concat(pathSrcHtml);
     var files = patterns.map(function (pattern) {
@@ -78,16 +87,16 @@ module.exports = function (config) {
         browsers: ['PhantomJS'],
-        webpack2: _.merge({
+       /* webpack: _.merge({
         }, webpackConfig, {
-            /*devtool: 'cheap-module-source-map'*/
+            devtool: 'inline-source-map'
         }),
         webpackServer: {
             quite: true
-        },
+        },*/
         plugins: [
-            require('karma-webpack'),
+//            require('karma-webpack'),
             'karma-chrome-launcher',
             'karma-phantomjs-launcher',
             'karma-angular-filesort',
@@ -116,8 +125,10 @@ module.exports = function (config) {
     // The coverage preprocessor is added in gulp/unit-test.js only for single tests
     // It was not possible to do it there because karma doesn't let us now if we are
     // running a single test or not
-     configuration.preprocessors = {}
-    //     'src/**/*.ts': ['sourcemap'],
+     configuration.preprocessors = {
+         'src/**/*.js': ['sourcemap'],
+         'src/**/*.ts': ['sourcemap']
+     };
     //     'src/**/*.js': ['sourcemap'],
     //     'src/**/*.[sS]pec.ts': ['sourcemap']
     // };
@@ -7,7 +7,7 @@
     "moment": "^2.11.2"
   },
   "scripts": {
-    "test": "gulp test",
+    "test": "webpack -w & karma start",
     "postinstall": "npm install -g bower && bower install",
     "start": "concurrently \"webpack -w\" \"gulp serve\""
   },
-// let oldDefine = Object.defineProperties;
-// 
-// Object.defineProperties = function(object, properties){
-//     let filteredProps = {};
-//     let currentProperties = Object.getOwnPropertyNames(object);
-//     for (let i = 0; i < currentProperties.length; i++) {
-//         let prop = currentProperties[i];
-//         if(currentProperties.indexOf(prop) < 0){
-//             filteredProps[prop] = properties[prop];
-//         }
-//     }
-//     oldDefine(object, <any>filteredProps);
-// };
-
 import {TestComponentBuilder} from 'ng-forward/cjs/testing/test-component-builder';
 import {Input, provide, Component} from 'ng-forward';
 import {ArticleDirective} from './article.directive';
-
-
-
-
-
 // Instantiate the Builder, this part is different than ng2.
 // In ng2 you inject tcb.
 const tcb = new TestComponentBuilder();
-// Create your test bed
-@Component({ selector: 'my-test' , template: '<hr />'})
+let html = '<noosfero-article [article]="ctr.article" [profile]="ctrl.profile"></noosfero-article>';
+
+// Create a component to include your testing component 
+@Component({ selector: 'my-test', template: html, directives: [ArticleDirective] })
 class TestArticleDirective {
     article = { type: 'TinyMceArticle' };
     profile = { name: 'profile-name' };
-    constructor(){
-            
+    constructor() {
     }
 }
-
 describe("Article Directive", () => {
-    it("does something", done => {
-        let html = '<noosfero-article [article]="ctr.article" [profile]="ctrl.profile"></noosfero-article>';
+    it("receives the article and profile as inputs", done => {
         tcb
-            .overrideTemplate(TestArticleDirective, html)
             .createAsync(TestArticleDirective).then(fixture => {
                 let myComponent: ArticleDirective = fixture.componentInstance;
                 expect(myComponent.article.type).toEqual("TinyMceArticle");
@@ -53,39 +32,28 @@ describe(&quot;Article Directive&quot;, () =&gt; {
             });
     });
-    // let html = '<noosfero-article [profile]=profile [artcile]=article></noosfero-article>';
+    it("renders a directive corresponding to the article type", done => {
-    // let noosferoApp: ng.IModule;
-    // let articleDirective: ArticleDirective;
-    // let $scope: ng.IScope;
-    // let element: ng.IAugmentedJQuery;
-    // beforeEach(angular.mock.module("noosferoApp"));
+        @Component({ selector: 'noosfero-TinyMceArticle', template: "<h1>custom component</h1>" })
+        class CustomArticleComponent {
-    // beforeEach(inject(function($controller: ng.IControllerService, $injector: ng.auto.IInjectorService, $rootScope, $q, $compile, $location, toastr) {
-    //     let routeParams = {};
-    //     let $scope: ng.IScope = $rootScope.$new();
-    //     (<any>$scope).ctrl = {
-    //         article: {
-    //             type: 'article'
-    //         },
-    //         profile: { }
-    //     };
-    //     element = getCompiledElement($scope, $compile);
-    //     //let element = angular.element('<noosfero-article article="ctrl.article" [profile]="ctrl.profile"></noosfero-article>');
-    //     //articleDirective = new ArticleDirective(element, $scope, $injector, $compile);
-    //     console.log(articleDirective);
-    // }));
+        }
-    // it("renders accordly the article type", (done) => {
-    //     expect(1 + 1).toEqual(2);
-    //     console.log(noosferoApp);
-    //     done();
-    // });
+        @Component({ selector: 'custom-article-type-test', template: html, directives: [ArticleDirective, CustomArticleComponent] })
+        class CustomArticleType {
+            article = { type: 'TinyMceArticle' };
+            profile = { name: 'profile-name' };
+            constructor() {
+            }
+        }
+        tcb
+            .createAsync(CustomArticleType).then(fixture => {
+                let myComponent: CustomArticleType = fixture.componentInstance;
+                expect(myComponent.article.type).toEqual("TinyMceArticle");
+                expect(myComponent.profile.name).toEqual("profile-name");
+                console.log(fixture.debugElement);
+                done();
+            });
+    });
-    // function getCompiledElement($scope, $compile) {
-    //     let element = angular.element('<noosfero-article [article]="ctrl.article" [profile]="ctrl.profile"></noosfero-article>');
-    //     let compiledElement = $compile(element)($scope);
-    //     $scope.$digest();
-    //     return compiledElement;
-    // }
 });
 \ No newline at end of file
+import "core-js/shim";
 import "reflect-metadata";
 import {NoosferoApp} from "./index.module";
 import {noosferoModuleConfig} from "./index.config";
@@ -0,0 +1,11 @@
+
+require("core-js/shim");
+require("reflect-metadata");
+require("ng-forward");
+
+
+// require all spec files 
+requireAll((<any>require).context("./", true, /spec.ts$/));
+function requireAll(r: any): any {
+    r.keys().forEach(r);
+}
 \ No newline at end of file
@@ -3,13 +3,14 @@
         "module": "commonjs",
         "target": "es5",
         "noImplicitAny": false,
-        "sourceMap": false,
+        "sourceMap": true,
         "experimentalDecorators": true
     },
     "exclude": [
         "node_modules",
         "typings/main",
-        "typings/main.d.ts"
+        "typings/main.d.ts",
+        "node_modules/ng-forward/cjs/util/jqlite-extensions.d.ts"
     ],
     "compileOnSave": false,
     "atom": {
@@ -3,13 +3,16 @@
 var argv = require("yargs").argv;
 var path = require("path");
 var glob = require("glob");
-var webpack = require("webpack");
+
+var CommonsChunkPlugin = require("webpack/lib/optimize/CommonsChunkPlugin");
 var extension = ".js";
 if (argv.production) {
   extension = ".min.js"
 }
+var testFiles = glob.sync("./src/**/*.[sS]pec.ts");
+
 var uglifyLoaderConfig = {
   // I want to uglify with mangling only app files, not thirdparty libs
   test: /\.js$/,
@@ -22,9 +25,10 @@ var testingFiles = glob.sync(&quot;./src/app/**/*.[sS]pec.ts&quot;);
 var webpackConfig = {
   entry: {
     noosfero: './src/app/index.ts',
-    'test': './src/test.ts'
+    'noosfero-specs': './src/spec.ts'
   },
+  plugins: [  new CommonsChunkPlugin("commons.js")],
   output: {
     path: path.join(__dirname, "src"),
@@ -38,7 +42,7 @@ var webpackConfig = {
     extensions: ['', '.webpack.js', '.web.js', '.ts', '.tsx', '.js']
   },
   // Source maps support (or 'inline-source-map' also works)
-  devtool: 'source-map',
+  devtool: 'inline-source-map',
   module: {
     loaders: [{
@@ -0,0 +1,130 @@		@@ -0,0 +1,130 @@
	1	+/* global process, */
	2	+'use strict';
	3	+
	4	+var path = require('path');
	5	+var conf = require('./gulp/conf');
	6	+
	7	+
	8	+var _ = require('lodash');
	9	+var wiredep = require('wiredep');
	10	+
	11	+var pathSrcHtml = [
	12	+ path.join(conf.paths.src, '/*/.html')
	13	+];
	14	+
	15	+function listFiles() {
	16	+ var wiredepOptions = _.extend({}, conf.wiredep, {
	17	+ dependencies: true,
	18	+ devDependencies: true
	19	+ });
	20	+
	21	+ var patterns = [].concat(wiredep(wiredepOptions).js)
	22	+ .concat([
	23	+ './src/spec.ts'
	24	+ ]
	25	+ )
	26	+ .concat(pathSrcHtml);
	27	+
	28	+ var files = patterns.map(function (pattern) {
	29	+ return {
	30	+ pattern: pattern
	31	+ };
	32	+ });
	33	+ files.push({
	34	+ pattern: path.join(conf.paths.src, '/assets/*/'),
	35	+ included: false,
	36	+ served: true,
	37	+ watched: false
	38	+ });
	39	+ return files;
	40	+}
	41	+
	42	+var webpackConfig = require("./webpack.config.js");
	43	+
	44	+module.exports = function (config) {
	45	+
	46	+ var configuration = {
	47	+ files: listFiles(),
	48	+
	49	+ singleRun: false,
	50	+
	51	+ autoWatch: true,
	52	+ colors: true,
	53	+
	54	+ logLevel: config.LOG_INFO,
	55	+
	56	+ ngHtml2JsPreprocessor: {
	57	+ stripPrefix: conf.paths.src + '/',
	58	+ moduleName: 'angular'
	59	+ },
	60	+
	61	+
	62	+ frameworks: ['jasmine', 'phantomjs-shim'],//, 'angular-filesort'],
	63	+
	64	+ angularFilesort: {
	65	+ whitelist: [path.join(conf.paths.src, '/*/!(.html\|.spec\|.mock).js')]
	66	+ },
	67	+
	68	+ browsers: ['PhantomJS'],
	69	+
	70	+ webpack: _.merge({
	71	+
	72	+ }, webpackConfig, {
	73	+ devtool: 'inline-source-map'
	74	+ }),
	75	+ webpackServer: {
	76	+ quite: true
	77	+ },
	78	+ plugins: [
	79	+ 'karma-chrome-launcher',
	80	+ 'karma-phantomjs-launcher',
	81	+ 'karma-angular-filesort',
	82	+ 'karma-webpack',
	83	+ 'karma-phantomjs-shim',
	84	+ 'karma-coverage',
	85	+ 'karma-jasmine',
	86	+ 'karma-spec-reporter',
	87	+ 'karma-ng-html2js-preprocessor',
	88	+ 'karma-sourcemap-loader'
	89	+ ],
	90	+
	91	+ coverageReporter: {
	92	+ type: 'html',
	93	+ dir: 'coverage/'
	94	+ },
	95	+
	96	+ reporters: ['spec', "coverage"],
	97	+
	98	+ proxies: {
	99	+ '/assets/': path.join('/base/', conf.paths.src, '/assets/')
	100	+ }
	101	+ };
	102	+
	103	+ // This is the default preprocessors configuration for a usage with Karma cli
	104	+ // The coverage preprocessor is added in gulp/unit-test.js only for single tests
	105	+ // It was not possible to do it there because karma doesn't let us now if we are
	106	+ // running a single test or not
	107	+ configuration.preprocessors = {
	108	+ 'src/*/.ts': ['webpack','sourcemap']
	109	+ };
	110	+
	111	+ pathSrcHtml.forEach(function (path) {
	112	+ configuration.preprocessors[path] = ['ng-html2js'];
	113	+ });
	114	+
	115	+ // This block is needed to execute Chrome on Travis
	116	+ // If you ever plan to use Chrome and Travis, you can keep it
	117	+ // If not, you can safely remove it
	118	+ // https://github.com/karma-runner/karma/issues/1144#issuecomment-53633076
	119	+ if (configuration.browsers[0] === 'Chrome' && process.env.TRAVIS) {
	120	+ configuration.customLaunchers = {
	121	+ 'chrome-travis-ci': {
	122	+ base: 'Chrome',
	123	+ flags: ['--no-sandbox']
	124	+ }
	125	+ };
	126	+ configuration.browsers = ['chrome-travis-ci'];
	127	+ }
	128	+
	129	+ config.set(configuration);
	130	+};
	@@ -7,7 +7,7 @@		@@ -7,7 +7,7 @@
7	"moment": "^2.11.2"	7	"moment": "^2.11.2"
8	},	8	},
9	"scripts": {	9	"scripts": {
10	- "test": "gulp test",	10	+ "test": "webpack -w & karma start",
11	"postinstall": "npm install -g bower && bower install",	11	"postinstall": "npm install -g bower && bower install",
12	"start": "concurrently \"webpack -w\" \"gulp serve\""	12	"start": "concurrently \"webpack -w\" \"gulp serve\""
13	},	13	},
1		1
		2	+import "core-js/shim";
2	import "reflect-metadata";	3	import "reflect-metadata";
3	import {NoosferoApp} from "./index.module";	4	import {NoosferoApp} from "./index.module";
4	import {noosferoModuleConfig} from "./index.config";	5	import {noosferoModuleConfig} from "./index.config";
	@@ -0,0 +1,11 @@		@@ -0,0 +1,11 @@
		1	+
		2	+require("core-js/shim");
		3	+require("reflect-metadata");
		4	+require("ng-forward");
		5	+
		6	+
		7	+// require all spec files
		8	+requireAll((<any>require).context("./", true, /spec.ts$/));
		9	+function requireAll(r: any): any {
		10	+ r.keys().forEach(r);
		11	+}
0	\ No newline at end of file	12	\ No newline at end of file