Updated template branch, bug fix for component pattern (#195)

* Updated branch to master

* Fixed bug with ignore components pattern

* Updated unit tests

Author: Blackbaud-SteveBrush

config/protractor/protractor-dev.conf.js

@@ -19,15 +19,16 @@ let config = {
 
     return new Promise((resolve, reject) => {
       const url = 'https://github.com/blackbaud/skyux-template';
+      const branch = 'master';
       common.exec(`rm`, [`-rf`, `${common.tmp}`])
 
         .then(() => common.exec(`git`, [
           `clone`,
           `-b`,
-          `update-package-dependencies`,
+          branch,
           `--single-branch`,
-          `${url}`,
-          `${common.tmp}`
+          url,
+          common.tmp
         ]))
 
         .then(() => common.exec(`npm`, [`i`, '--only=prod'], common.cwdOpts))

config/sky-pages/sky-pages.config.js

@@ -71,7 +71,7 @@ module.exports = {
         },
         command: command,
         componentsPattern: '**/*.component.ts',
-        componentsIgnorePattern: './public/',
+        componentsIgnorePattern: './public/**/*',
         includeRouteModule: true,
         routesPattern: '**/index.html',
         runtimeAlias: 'sky-pages-internal/runtime',

test/fixtures/public/sky-pages-component-generator.fixture.component.js test/fixtures/public/sky-pages-component-generator.fixture.component.ts

@@ -1,6 +1,8 @@
 /*jshint jasmine: true, node: true */
 'use strict';
 
+const path = require('path');
+
 describe('SKY UX Builder component generator', () => {
 
   const runtimeUtils = require('../utils/runtime-test-utils');
@@ -142,7 +144,7 @@ describe('SKY UX Builder component generator', () => {
 
   it('should ignore components in the public directory', () => {
     let config = runtimeUtils.getDefaultRuntime();
-    config.srcPath = './fixtures';
+    config.srcPath = path.resolve(__dirname, 'fixtures');
     const components = generator.getComponents({
       runtime: config
     });

test/sky-pages-component-generator.spec.js

@@ -13,7 +13,7 @@ module.exports = {
       },
       command: '',
       componentsPattern: '**/*.component.ts',
-      componentsIgnorePattern: './public/',
+      componentsIgnorePattern: './public/**/*',
       includeRouteModule: true,
       routes: [],
       routesPattern: '**/index.html',