Skip to content

Commit 46a0fe1

Browse files
author
Yvonne Yip
committed
remove tools submodule
1 parent 90ecb3d commit 46a0fe1

27 files changed

+29
-33
lines changed

‎.gitmodules

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

‎conf/karma.conf.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
module.exports = function(karma) {
2-
var common = require('../tools/test/karma-common.conf.js');
2+
var common = require('../../tools/test/karma-common.conf.js');
33
karma.set(common.mixin_common_opts(karma, {
44
// base path, that will be used to resolve files and exclude
55
basePath: '../../',
66

77
// list of files / patterns to load in the browser
88
files: [
9-
'polymer/tools/test/mocha-htmltest.js',
9+
'tools/test/mocha-htmltest.js',
1010
'polymer/conf/mocha.conf.js',
1111
'polymer/node_modules/chai/chai.js',
1212
'polymer/polymer.js',
@@ -41,7 +41,7 @@ module.exports = function(karma) {
4141
{pattern: 'polymer/test/**/*.css', included: false},
4242
{pattern: 'polymer/test/**/*.html', included: false},
4343
{pattern: 'polymer/test/**/*.js', included: false},
44-
{pattern: 'polymer/tools/**/*.js', included: false}
44+
{pattern: 'tools/**/*.js', included: false}
4545
]
4646
}));
4747
};

‎gruntfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ module.exports = function(grunt) {
7878
outdir: 'docs',
7979
linkNatives: 'true',
8080
tabtospace: 2,
81-
themedir: 'tools/doc/themes/bootstrap'
81+
themedir: '../tools/doc/themes/bootstrap'
8282
}
8383
}
8484
},

‎polymer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ var src = script.attributes.src.value;
5252
var basePath = src.slice(0, src.indexOf(thisFile));
5353

5454
if (!window.PolymerLoader) {
55-
var path = basePath + 'tools/loader/loader.js';
55+
var path = basePath + '../tools/loader/loader.js';
5656
document.write('<script src="' + path + '"></script>');
5757
}
5858
document.write('<script>PolymerLoader.load("' + scopeName + '")</script>');

‎test/html/attr-mustache.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<title>attribute mustaches</title>
55
<script src="../../polymer.js"></script>
6-
<script src="../../tools/test/htmltest.js"></script>
6+
<script src="../../../tools/test/htmltest.js"></script>
77
<script src="../../node_modules/chai/chai.js"></script>
88
</head>
99
<body>

‎test/html/bind-object-repeat.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<title>bind object + repeat</title>
55
<script src="../../polymer.js"></script>
6-
<script src="../../tools/test/htmltest.js"></script>
6+
<script src="../../../tools/test/htmltest.js"></script>
77
<script src="../../node_modules/chai/chai.js"></script>
88
</head>
99
<body>

‎test/html/callbacks.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<head>
44
<title>event path</title>
55
<script src="../../polymer.js"></script>
6-
<script src="../../tools/test/htmltest.js"></script>
7-
<script src="../../tools/test/chai/chai.js"></script>
6+
<script src="../../../tools/test/htmltest.js"></script>
7+
<script src="../../node_modules/chai/chai.js"></script>
88
</head>
99
<body>
1010

‎test/html/element-import.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<title>element script</title>
55
<script src="../../polymer.js"></script>
6-
<script src="../../tools/test/htmltest.js"></script>
6+
<script src="../../../tools/test/htmltest.js"></script>
77
<script src="../../node_modules/chai/chai.js"></script>
88
<link rel="import" href="element-import/import.html">
99
</head>

‎test/html/element-registration.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<head>
44
<title>element script</title>
55
<script src="../../polymer.js"></script>
6-
<script src="../../tools/test/htmltest.js"></script>
7-
<script src="../../tools/test/chai/chai.js"></script>
6+
<script src="../../../tools/test/htmltest.js"></script>
7+
<script src="../../node_modules/chai/chai.js"></script>
88
</head>
99
<body>
1010
<x-foo></x-foo>

‎test/html/element-script.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<title>element script</title>
55
<script src="../../polymer.js"></script>
6-
<script src="../../tools/test/htmltest.js"></script>
6+
<script src="../../../tools/test/htmltest.js"></script>
77
<script src="../../node_modules/chai/chai.js"></script>
88
<script src="element-script/elements.js"></script>
99
</head>

‎test/html/event-path-declarative.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<html>
77
<head>
88
<script src="../../polymer.js"></script>
9-
<script src="../../tools/test/htmltest.js"></script>
9+
<script src="../../../tools/test/htmltest.js"></script>
1010
<script src="../../node_modules/chai/chai.js"></script>
1111
</head>
1212
<body>

‎test/html/event-path.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<title>event path</title>
55
<script src="../../polymer.js"></script>
6-
<script src="../../tools/test/htmltest.js"></script>
6+
<script src="../../../tools/test/htmltest.js"></script>
77
<script src="../../node_modules/chai/chai.js"></script>
88
</head>
99
<body>

‎test/html/mdv-syntax.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<meta charset="UTF-8">
1010
<title>mdv syntax</title>
1111
<script src="../../polymer.js"></script>
12-
<script src="../../tools/test/htmltest.js"></script>
12+
<script src="../../../tools/test/htmltest.js"></script>
1313
<script src="../../node_modules/chai/chai.js"></script>
1414
</head>
1515
<body>

‎test/html/parser-rules-import.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html>
33
<head>
44
<title>HTML Imports Test</title>
5-
<script src="../../tools/test/htmltest.js"></script>
5+
<script src="../../../tools/test/htmltest.js"></script>
66
<script src="../../node_modules/chai/chai.js"></script>
77
<script src="../../custom-elements.js"></script>
88
</head>

‎test/html/parser-rules.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html>
33
<head>
44
<title>HTML Imports Test</title>
5-
<script src="../../tools/test/htmltest.js"></script>
5+
<script src="../../../tools/test/htmltest.js"></script>
66
<script src="../../node_modules/chai/chai.js"></script>
77
<script src="../../polymer.js"></script>
88
</head>

‎test/html/prop-attr-reflection.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<title>publish attributes</title>
55
<script src="../../polymer.js"></script>
6-
<script src="../../tools/test/htmltest.js"></script>
6+
<script src="../../../tools/test/htmltest.js"></script>
77
<script src="../../node_modules/chai/chai.js"></script>
88
</head>
99
<body>

‎test/html/prop-bind-oo.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<title>bind properties compatible with object observe</title>
55
<script src="../../polymer.js"></script>
6-
<script src="../../tools/test/htmltest.js"></script>
6+
<script src="../../../tools/test/htmltest.js"></script>
77
<script src="../../node_modules/chai/chai.js"></script>
88
</head>
99
<body>

‎test/html/publish-attributes.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<title>publish attributes</title>
55
<script src="../../polymer.js"></script>
6-
<script src="../../tools/test/htmltest.js"></script>
6+
<script src="../../../tools/test/htmltest.js"></script>
77
<script src="../../node_modules/chai/chai.js"></script>
88
</head>
99
<body>

‎test/html/styling/apply-reset-styles.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<head>
99
<title>applyAuthorStyles / resetStyleInheirtance</title>
1010
<script src="../../../polymer.js"></script>
11-
<script src="../../../tools/test/htmltest.js"></script>
11+
<script src="../../../../tools/test/htmltest.js"></script>
1212
<script src="../../../node_modules/chai/chai.js"></script>
1313
<style>
1414
body {

‎test/html/styling/sheet-main-doc.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<meta name="viewport" content="initial-scale=1.0">
1010
<title>loading sheets in elements defined in main document</title>
1111
<script src="../../../polymer.js"></script>
12-
<script src="../../../tools/test/htmltest.js"></script>
12+
<script src="../../../../tools/test/htmltest.js"></script>
1313
<script src="../../../node_modules/chai/chai.js"></script>
1414
<link rel="import" href="x-sheet-main-doc.html">
1515
</head>

‎test/html/styling/sheet-order.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<meta name="viewport" content="initial-scale=1.0">
1010
<title>Sheet order</title>
1111
<script src="../../../polymer.js"></script>
12-
<script src="../../../tools/test/htmltest.js"></script>
12+
<script src="../../../../tools/test/htmltest.js"></script>
1313
<script src="../../../node_modules/chai/chai.js"></script>
1414
<link rel="import" href="x-sheets.html">
1515
<style>

‎test/html/styling/sheet-scope.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<head>
99
<title>Sheet scope</title>
1010
<script src="../../../polymer.js"></script>
11-
<script src="../../../tools/test/htmltest.js"></script>
11+
<script src="../../../../tools/test/htmltest.js"></script>
1212
<script src="../../../node_modules/chai/chai.js"></script>
1313
<style>
1414
</style>

‎test/html/take-attributes.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<title>take attributes</title>
55
<script src="../../polymer.js"></script>
6-
<script src="../../tools/test/htmltest.js"></script>
6+
<script src="../../../tools/test/htmltest.js"></script>
77
<script src="../../node_modules/chai/chai.js"></script>
88
</head>
99
<body>

‎test/html/template-distribute-dynamic.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<title>template distribute</title>
55
<script src="../../polymer.js"></script>
6-
<script src="../../tools/test/htmltest.js"></script>
6+
<script src="../../../tools/test/htmltest.js"></script>
77
<script src="../../node_modules/chai/chai.js"></script>
88
</head>
99
<body>

‎test/html/unbind.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<title>unbind</title>
55
<script src="../../polymer.js"></script>
6-
<script src="../../tools/test/htmltest.js"></script>
6+
<script src="../../../tools/test/htmltest.js"></script>
77
<script src="../../node_modules/chai/chai.js"></script>
88
</head>
99
<body>

‎test/runner.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<link rel="stylesheet" href="../node_modules/mocha/mocha.css" />
1313
<script src="../node_modules/mocha/mocha.js"></script>
1414
<script src="../node_modules/chai/chai.js"></script>
15-
<script src="../tools/test/mocha-htmltest.js"></script>
15+
<script src="../../tools/test/mocha-htmltest.js"></script>
1616
<!-- -->
1717
<script src="../polymer.js" debug></script>
1818
</head>

‎tools

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)