Merge pull request #24 from Polymer/master

7/11 master -> stable

.gitignore

@@ -4,3 +4,6 @@
 /test.bat
 
 /build/shadowdom.conditional.js
+platform.min*
+platform.native*
+platform.sandbox*

conf/karma.conf.js

@@ -1,88 +1,102 @@
-// Sample Karma configuration file, that contain pretty much all the available options
-// It's used for running client tests on Travis (http://travis-ci.org/#!/karma-runner/karma)
-// Most of the options can be overriden by cli arguments (see karma --help)
-//
-// For all available config options and default values, see:
-// https://github.com/karma-runner/karma/blob/stable/lib/config.js#L54
-
-
-// base path, that will be used to resolve files and exclude
-basePath = '../';
-
-// list of files / patterns to load in the browser
-files = [
-  'tools/test/mocha-htmltest.js',
-  'conf/mocha.conf.js',
-  'node_modules/chai/chai.js',
-  'test/js/*.js',
-  {pattern: 'tools/**/*.js', included: false},
-  {pattern: 'platform.*', included: false},
-  {pattern: 'test/**/*.html', included: false},
-  {pattern: 'test/**/*.js', included: false}
-];
-
-// list of files to exclude
-exclude = [];
-
-frameworks = ['mocha'];
-
-// use dots reporter, as travis terminal does not support escaping sequences
-// possible values: 'dots', 'progress', 'junit', 'teamcity'
-// CLI --reporters progress
-reporters = ['progress'];
-
-// web server port
-// CLI --port 9876
-port = 9876;
-
-// cli runner port
-// CLI --runner-port 9100
-runnerPort = 9100;
-
-// enable / disable colors in the output (reporters and logs)
-// CLI --colors --no-colors
-colors = true;
-
-// level of logging
-// possible values: LOG_DISABLE || LOG_ERROR || LOG_WARN || LOG_INFO || LOG_DEBUG
-// CLI --log-level debug
-logLevel = LOG_INFO;
-
-// enable / disable watching file and executing tests whenever any file changes
-// CLI --auto-watch --no-auto-watch
-autoWatch = true;
-
-// Start these browsers, currently available:
-// - Chrome
-// - ChromeCanary
-// - Firefox
-// - Opera
-// - Safari (only Mac)
-// - PhantomJS
-// - IE (only Windows)
-// CLI --browsers Chrome,Firefox,Safari
-browsers = ['ChromeCanary'];
-
-// If browser does not capture in given timeout [ms], kill it
-// CLI --capture-timeout 5000
-captureTimeout = 50000;
-
-// Auto run tests on start (when browsers are captured) and exit
-// CLI --single-run --no-single-run
-singleRun = true;
-
-// report which specs are slower than 500ms
-// CLI --report-slower-than 500
-reportSlowerThan = 500;
-
-// compile coffee scripts
-preprocessors = {
+module.exports = function(karma) {
+  karma.configure({
+    // base path, that will be used to resolve files and exclude
+    basePath: '../../',
+
+    // list of files / patterns to load in the browser
+    files: [
+      'platform/tools/test/mocha-htmltest.js',
+      'platform/conf/mocha.conf.js',
+      'platform/node_modules/chai/chai.js',
+      'platform/test/js/*.js',
+      {pattern: 'platform/node_modules/mocha/mocha.*', included: false},
+      {pattern: 'platform/tools/**/*.js', included: false},
+      {pattern: 'platform/platform.*', included: false},
+      {pattern: 'platform/test/**/*.html', included: false},
+      {pattern: 'platform/test/**/*.js', included: false},
+      {pattern: 'platform/src/*.js', included: false},
+      {pattern: 'CustomElements/custom-elements.js', included: false},
+      {pattern: 'CustomElements/MutationObservers/*.js', included: false},
+      {pattern: 'CustomElements/src/*.js', included: false},
+      {pattern: 'HTMLImports/html-imports.js', included: false},
+      {pattern: 'HTMLImports/src/*', included: false},
+      {pattern: 'mdv/mdv.js', included: false},
+      {pattern: 'mdv/src/*', included: false},
+      {pattern: 'mdv/third_party/**/*.js', included: false},
+      {pattern: 'mdv/util/*.js', included: false},
+      {pattern: 'mdv/tests/*.js', included: false},
+      {pattern: 'ShadowDOM/shadowdom.js', included: false},
+      {pattern: 'ShadowDOM/src/**/*.js', included: false},
+      {pattern: 'PointerEvents/pointerevents.js', included: false},
+      {pattern: 'PointerEvents/src/*.js', included: false},
+      {pattern: 'PointerGestures/pointergestures.js', included: false},
+      {pattern: 'PointerGestures/src/*.js', included: false}
+    ],
+
+    // list of files to exclude
+    exclude: [],
+
+    frameworks: ['mocha'],
+
+    // use dots reporter, as travis terminal does not support escaping sequences
+    // possible values: 'dots', 'progress', 'junit', 'teamcity'
+    // CLI --reporters progress
+    reporters: ['progress'],
+
+    // web server port
+    // CLI --port 9876
+    port: 9876,
+
+    // cli runner port
+    // CLI --runner-port 9100
+    runnerPort: 9100,
+
+    // enable / disable colors in the output (reporters and logs)
+    // CLI --colors --no-colors
+    colors: true,
+
+    // level of logging
+    // possible values: LOG_DISABLE || LOG_ERROR || LOG_WARN || LOG_INFO || LOG_DEBUG
+    // CLI --log-level debug
+    logLevel: karma.LOG_INFO,
+
+    // enable / disable watching file and executing tests whenever any file changes
+    // CLI --auto-watch --no-auto-watch
+    autoWatch: true,
+
+    // Start these browsers, currently available:
+    // - Chrome
+    // - ChromeCanary
+    // - Firefox
+    // - Opera
+    // - Safari (only Mac)
+    // - PhantomJS
+    // - IE (only Windows)
+    // CLI --browsers Chrome,Firefox,Safari
+    browsers: ['ChromeCanary'],
+
+    // If browser does not capture in given timeout [ms], kill it
+    // CLI --capture-timeout 5000
+    captureTimeout: 50000,
+
+    // Auto run tests on start (when browsers are captured) and exit
+    // CLI --single-run --no-single-run
+    singleRun: true,
+
+    // report which specs are slower than 500ms
+    // CLI --report-slower-than 500
+    reportSlowerThan: 500,
+
+    // compile coffee scripts
+    preprocessors: {
+    },
+
+    plugins: [
+      'karma-mocha',
+      'karma-chrome-launcher',
+      'karma-firefox-launcher',
+      'karma-script-launcher',
+      'karma-crbot-reporter'
+    ]
+  });
 };
-
-plugins = [
-  'karma-mocha',
-  'karma-chrome-launcher',
-  'karma-firefox-launcher',
-  'karma-script-launcher',
-  'karma-crbot-reporter'
-]

conf/mocha.conf.js

@@ -2,5 +2,5 @@ mocha.setup({
   ui: 'tdd',
   slow: 1000,
   timeout: 8000,
-  htmlbase: '/base/test/'
+  htmlbase: '/base/platform/test/'
 });

gruntfile.js

@@ -6,7 +6,7 @@
 module.exports = function(grunt) {
   ShadowDOMNative = [
     '../CustomElements/src/sidetable.js',
-    'lib/patches-shadowdom-native.js'
+    'src/patches-shadowdom-native.js'
   ];
 
   ShadowDOMPolyfill = [
@@ -36,14 +36,15 @@ module.exports = function(grunt) {
     return '../ShadowDOM/src/' + p;
   });
   ShadowDOMPolyfill.push(
-    'lib/patches-shadowdom-polyfill.js'
+    'src/patches-shadowdom-polyfill.js',
+    'src/ShadowCSS.js'
   );
 
   Lib = [
-    'lib/lang.js',
-    'lib/dom.js',
-    'lib/template.js',
-    'lib/inspector.js'
+    'src/lang.js',
+    'src/dom.js',
+    'src/template.js',
+    'src/inspector.js'
   ];
 
   MDV = [
@@ -57,7 +58,7 @@ module.exports = function(grunt) {
   });
 
   MDV.push(
-    'lib/patches-mdv.js'
+    'src/patches-mdv.js'
   );
 
   PointerEvents = [
@@ -107,7 +108,7 @@ module.exports = function(grunt) {
     '../CustomElements/src/HTMLElementElement.js',
     '../CustomElements/src/Parser.js',
     '../CustomElements/src/boot.js',
-    'lib/patches-custom-elements.js'
+    'src/patches-custom-elements.js'
   ];
 
   Main = [].concat(
@@ -141,7 +142,7 @@ module.exports = function(grunt) {
     'build/shadowdom.conditional.js',
     Lib,
     MDV,
-    'lib/patches-html-imports-csp.js',
+    'src/patches-html-imports-csp.js',
     HTMLImports,
     CustomElements,
     PointerEvents,
@@ -265,7 +266,7 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-concat');
   grunt.loadNpmTasks('grunt-contrib-uglify');
   grunt.loadNpmTasks('grunt-contrib-yuidoc');
-  grunt.loadNpmTasks('grunt-karma-0.9.1');
+  grunt.loadNpmTasks('grunt-karma');
 
   // tasks
   grunt.registerTask('default', ['concat', 'uglify']);

package.json

@@ -8,7 +8,7 @@
     "grunt-contrib-concat": "*",
     "grunt-contrib-uglify": "*",
     "grunt-contrib-yuidoc": "~0.4.0",
-    "grunt-karma-0.9.1": "~0.4.3",
+    "grunt-karma": "~0.5.0",
     "karma-mocha": "*",
     "karma-script-launcher": "*",
     "karma-crbot-reporter": "*"