Auto generate imports in elements.html

robdodson · robdodson · commit 468c97a7190f · 2014-07-14T18:31:13.000-07:00
diff --git a/app/index.js b/app/index.js
@@ -65,6 +65,7 @@ module.exports = yeoman.generators.Base.extend({
     this.template('app/favicon.ico');
     this.template('app/robots.txt');
     this.copy('app/htaccess', 'app/.htaccess');
+    this.copy('app/elements.html', 'app/elements/elements.html');
     this.copy('app/yo-list.html', 'app/elements/yo-list.html');
     this.copy('app/yo-greeting.html', 'app/elements/yo-greeting.html');
     this.write('app/index.html', this.indexFile);
diff --git a/app/templates/app/elements.html b/app/templates/app/elements.html
@@ -0,0 +1,2 @@
+<link rel="import" href="yo-list.html">
+<link rel="import" href="yo-greeting.html">
diff --git a/app/templates/index.html b/app/templates/index.html
@@ -14,8 +14,7 @@
 
         <!-- Place your HTML imports here -->
         <script src="bower_components/platform/platform.js"></script>
-        <link rel="import" href="elements/yo-list.html">
-        <link rel="import" href="elements/yo-greeting.html">
+        <link rel="import" href="elements/elements.html">
     </head>
     <body unresolved>
 
diff --git a/el/index.js b/el/index.js
@@ -17,6 +17,12 @@ module.exports = yeoman.generators.Base.extend({
       return;
     }
 
+    // Create the template element
     this.template('_element.html', 'app/elements/' + this.elementName + '.html');
+
+    // Wire up the dependency in elements.html
+    var file = this.readFileAsString('app/elements/elements.html');
+    file += '<link rel="import" href="' + this.elementName + '.html">\n';
+    this.writeFileFromString(file, 'app/elements/elements.html');
   }
 });
diff --git a/test/app-test.js b/test/app-test.js
@@ -3,7 +3,7 @@
 var path    = require('path');
 var helpers = require('yeoman-generator').test;
 
-describe('Polymer generator test', function () {
+describe('yo polymer:app test', function () {
   before(function (done) {
     helpers.testDirectory(path.join(__dirname, 'temp'), function (err) {
       if (err) {
@@ -43,6 +43,7 @@ describe('Polymer generator test', function () {
       'app/favicon.ico',
       'app/.htaccess',
       'app/robots.txt',
+      'app/elements/elements.html',
       'app/elements/yo-greeting.html',
       'app/elements/yo-list.html'
     ];
diff --git a/test/el-test.js b/test/el-test.js
@@ -3,20 +3,29 @@
 var path    = require('path');
 var helpers = require('yeoman-generator').test;
 
-describe('Polymer generator test', function () {
+describe('yo polymer:el test', function () {
   before(function (done) {
     helpers.testDirectory(path.join(__dirname, 'temp'), function (err) {
       if (err) {
         return done(err);
       }
 
-      this.polymer = helpers.createGenerator('polymer:el', [
+      // Create the polymer:app generator
+      this.polymer = helpers.createGenerator('polymer:app', [
+        '../../app', [
+          helpers.createDummyGenerator(),
+          'mocha:app'
+        ]
+      ]);
+      this.polymer.options['skip-install'] = true;
+
+      // Create the polymer:el generator
+      this.element = helpers.createGenerator('polymer:el', [
         '../../el', [
           helpers.createDummyGenerator(),
           'mocha:el'
         ]
       ], 'x-foo');
-      this.polymer.options['skip-install'] = true;
 
       done();
     }.bind(this));
@@ -32,10 +41,19 @@ describe('Polymer generator test', function () {
       'app/elements/x-foo.html'
     ];
 
-    this.polymer.run({}, function () {
-      helpers.assertFiles(expected);
-      done();
+    helpers.mockPrompt(this.polymer, {
+      includeCore: true,
+      includePaper: true
     });
+
+    // Run the polymer:app generator
+    this.polymer.run({}, function () {
+      // Then run the polymer:el generator
+      this.element.run({}, function() {
+        helpers.assertFiles(expected);
+        done();
+      });
+    }.bind(this));
   });
 
 });
diff --git a/test/seed-test.js b/test/seed-test.js
@@ -3,7 +3,7 @@
 var path    = require('path');
 var helpers = require('yeoman-generator').test;
 
-describe('Polymer generator test', function () {
+describe('yo polymer:seed test', function () {
   before(function (done) {
     helpers.testDirectory(path.join(__dirname, 'temp'), function (err) {
       if (err) {

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+<link rel="import" href="yo-list.html">`
	`2`	`+<link rel="import" href="yo-greeting.html">`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,12 @@ module.exports = yeoman.generators.Base.extend({`
`17`	`17`	`return;`
`18`	`18`	`}`
`19`	`19`
	`20`	`+ // Create the template element`
`20`	`21`	`this.template('_element.html', 'app/elements/' + this.elementName + '.html');`
	`22`	`+`
	`23`	`+ // Wire up the dependency in elements.html`
	`24`	`+ var file = this.readFileAsString('app/elements/elements.html');`
	`25`	`+ file += '<link rel="import" href="' + this.elementName + '.html">\n';`
	`26`	`+ this.writeFileFromString(file, 'app/elements/elements.html');`
`21`	`27`	`}`
`22`	`28`	`});`