Merge lp:~jonas-drange/online-services-common-js/1319334-ci into lp:online-services-common-js

[Jonas G. Drange]

- add tarmac_verify.sh which jenkins will pick up and run
- remove bower, replace with config-managed yui
- remove prepublish scripts from npm
- search/replace bower YUI path with new config-managed path
   - via hacky script
   - beatifulsoup mangles the HTML a bit (actually cleans it up too), but I favor this over manually editing all test runners

[Stephen Stewart (stephen-stewart)]

> +$GRUNT --no-color bootstrap grover mocha

Maybe add a 'verify' task to grunt which contains these 3, will a comment explaining that this is the command tarmac runs.

Otherwise WFM.

[lp:~jonas-drange/online-services-common-js/1319334-ci]

41. By Jonas G. Drange on 2014-05-15

grunt verify task

[Stephen Stewart (stephen-stewart)]

WFM

review: Approve

=== modified file 'Gruntfile.js'
--- Gruntfile.js	2014-04-02 13:36:17 +0000
+++ Gruntfile.js	2014-05-15 15:07:26 +0000
@@ -255,6 +255,9 @@
     grunt.registerTask('run', ['connect', 'watch']);
     grunt.registerTask('bootstrap', ['shell:configmanager', 'shell:bootstrap']);
 
+    // task run by jenkins
+    grunt.registerTask('verify', ['bootstrap', 'grover', 'mocha']);
+
     grunt.registerTask('shifter', 'Build YUI modules with Shifter', function() {
         var done = this.async(),
             config = grunt.config.get('shifter.options') || {},

=== removed file 'bower.json'
--- bower.json	2014-04-02 10:35:07 +0000
+++ bower.json	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-{
-  "name": "online-services-js",
-  "version": "1.0.1",
-  "devDependencies": {
-    "yui3": "git://github.com/yui/yui3#3.14.1"
-  }
-}

=== modified file 'config-manager.txt'
--- config-manager.txt	2014-05-13 11:03:26 +0000
+++ config-manager.txt	2014-05-15 15:07:26 +0000
@@ -1,1 +1,2 @@
 branches/ulysses               bzr+ssh://bazaar.launchpad.net/~ubuntuone-hackers/ulysses/trunk;revno=42
+branches/yui                   bzr+ssh://bazaar.launchpad.net/~ubuntuone-pqm-team/yui/stable;revno=4526

=== modified file 'package.json'
--- package.json	2014-04-02 15:32:44 +0000
+++ package.json	2014-05-15 15:07:26 +0000
@@ -4,10 +4,6 @@
   "description": "online services yui modules",
   "homepage": "https://launchpad.net/online-services-common-js",
   "bugs": "https://bugs.launchpad.net/online-services-common-js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "prepublish": "grunt bootstrap && bower install && grunt test"
-  },
   "repository": {
     "type": "bzr",
     "url": "lp:online-services-common-js"
@@ -21,6 +17,7 @@
   "license": "AGPL-3.0",
   "devDependencies": {
     "grunt": "~0.4.2",
+    "grunt-cli": "~0.1.13",
     "grunt-contrib-clean": "~0.5.0",
     "grunt-contrib-compress": "~0.5.3",
     "grunt-contrib-connect": "~0.6.0",

=== added directory 'scripts'
=== added file 'scripts/change-test-runner.py'
--- scripts/change-test-runner.py	1970-01-01 00:00:00 +0000
+++ scripts/change-test-runner.py	2014-05-15 15:07:26 +0000
@@ -0,0 +1,192 @@
+#!/usr/bin/env python
+"""
+SYNOPSIS
+    change-test-runner.py [options]
+        [--help] [--verbose] [--version]
+        list-changes
+        <change> <what>
+
+DESCRIPTION
+    Change various aspects of test runners (e.g. navbar/tests/unit/index.html)
+
+EXAMPLES
+    change-test-runner.py --module navbar base.src http://disney.com/base.js
+
+"""
+
+import sys
+import os
+import traceback
+import optparse
+from glob import glob
+
+from bs4 import BeautifulSoup
+import re
+#from pexpect import run, spawn
+
+SRC_DIR = 'src'
+TEST_RUNNER_PATH = ['tests', 'unit', '*.html']
+
+
+class NotImplementedError(Exception):
+    pass
+
+
+def yui_src(html, newval):
+    yui = html.find(
+        attrs={
+            'id': 'yui-src'
+        })
+    yui['src'] = newval
+    return html
+
+
+def yui_base_src(html, newval):
+    """Frail search/replace of YUI base property"""
+    scripts = html.find_all('script')
+
+    for script in scripts:
+        r = re.search('base\:\ (?P<src>\'.+yui.+\')', str(script))
+        if r:
+            new_script = re.sub(
+                'base\: \'.+yui.+\'', 'base: \'%s\'' % newval, script.string)
+
+            script.string = new_script
+    return html
+
+
+def config_src(html, newval):
+    raise NotImplementedError
+
+
+def base_src(html, newval):
+    raise NotImplementedError
+
+
+def mocha_js_src(html, newval):
+    raise NotImplementedError
+
+
+def mocha_css_href(html, newval):
+    raise NotImplementedError
+
+
+def chai_js_src(html, newval):
+    raise NotImplementedError
+
+CHANGES = {
+    'yui-src': yui_src,
+    'yui-base-src': yui_base_src,
+    'config-src': config_src,
+    'base-src': base_src,
+    'mocha-js-src': mocha_js_src,
+    'mocha-css-href': mocha_css_href,
+    'chai-js-src': chai_js_src
+}
+
+
+def _get_test_runner(module):
+    """Return array of runners"""
+    runners = []
+    files = glob(os.path.join(SRC_DIR, module, *TEST_RUNNER_PATH))
+
+    for f in files:
+        if os.path.isfile(f):
+            runners.append(f)
+    return runners
+
+
+def _get_test_runners():
+    """Return array of runners"""
+    test_dirs = [d for d in os.listdir(SRC_DIR)]
+    test_runners = []
+
+    for d in test_dirs:
+        files = glob(os.path.join(SRC_DIR, d, *TEST_RUNNER_PATH))
+        for f in files:
+            if os.path.isfile(f):
+                test_runners.append(f)
+
+    return test_runners
+
+
+def modify(runners, options, args):
+    """Modify runners as requested"""
+    if len(runners) == 0:
+        return
+
+    for runner in runners:
+        with open(runner, 'r+') as content_file:
+            html = content_file.read()
+            parsed_html = BeautifulSoup(html)
+            new_html = CHANGES[args[0]](parsed_html, args[1])
+
+            if options.dry_run:
+                print new_html
+            else:
+                content_file.seek(0)
+                content_file.write(str(new_html))
+                content_file.truncate()
+
+
+def main():
+    global options, args
+
+    if options.module:
+        paths = _get_test_runner(options.module)
+    else:
+        paths = _get_test_runners()
+
+    modify(paths, options, args)
+
+
+if __name__ == '__main__':
+    try:
+        parser = optparse.OptionParser(
+            formatter=optparse.TitledHelpFormatter(),
+            usage=globals()['__doc__'], version='42')
+
+        parser.add_option(
+            '--verbose', action='store_true',
+            default=False, help='verbose output')
+
+        parser.add_option(
+            '--module', action='store',
+            default=None, help='module')
+
+        parser.add_option(
+            '--dry-run', action='store_true',
+            default=False, help='dry run')
+
+        (options, args) = parser.parse_args()
+
+        if len(args) < 1:
+            parser.error('not enough arguments')
+
+        if args[0] == 'list-changes':
+            for k in CHANGES.keys():
+                print k
+        else:
+
+            if len(args) < 2:
+                parser.error('not enough arguments')
+
+            if not args[1]:
+                parser.error('missing newval')
+
+            main()
+
+        sys.exit(0)
+
+    except KeyboardInterrupt, e:  # Ctrl-C
+        raise e
+    except SystemExit, e:  # sys.exit()
+        raise e
+    except NotImplementedError:
+        print "error: %s has not been implemented yet" % args[0]
+        os._exit(1)
+    except Exception, e:
+        print 'unexpected error'
+        print str(e)
+        traceback.print_exc()
+        os._exit(1)

=== renamed file 'import.sh' => 'scripts/import.sh'
--- import.sh	2014-02-22 19:13:25 +0000
+++ scripts/import.sh	2014-05-15 15:07:26 +0000
@@ -2,8 +2,8 @@
 rm .jshintrc
 find . -name "*.html" -exec sed -i "/filter: .*/d" {} \;
 find . -name "*.html" -exec sed -i "s#../../../../build/one-yui-config/one-yui-config-min.js#../../../../build/config.js#g" {} \;
-find . -name "*.html" -exec sed -i "s#base: '../../../../../yui/'#base: '../../../../bower_components/yui3/build/'#g" {} \;
-find . -name "*.html" -exec sed -i "s#../../../../../yui/yui/yui-min.js#../../../../bower_components/yui3/build/yui/yui-min.js#g" {} \;
+find . -name "*.html" -exec sed -i "s#base: '../../../../../yui/'#base: '../../../../branches/yui/build/'#g" {} \;
+find . -name "*.html" -exec sed -i "s#../../../../../yui/yui/yui-min.js#../../../../branches/yui/build/yui/yui-min.js#g" {} \;
 find . -name "build.json" -exec sed -i "s/one-//g" {} \;
 find src/ -name "one-*.css" -exec rename 's/one-//g' {} \;
 

=== modified file 'src/carousel/tests/unit/index.html'
--- src/carousel/tests/unit/index.html	2014-03-12 14:09:06 +0000
+++ src/carousel/tests/unit/index.html	2014-05-15 15:07:26 +0000
@@ -1,18 +1,15 @@
-<!doctype html>
-<meta charset="utf-8" />
+<!DOCTYPE html>
+<html><head><meta charset="utf-8"/>
 <title>carousel Unit Tests</title>
-<link rel="stylesheet" href="../../../../node_modules/mocha/mocha.css">
-
-<script src="../../../../bower_components/yui3/build/yui/yui-min.js"></script>
+<link href="../../../../node_modules/mocha/mocha.css" rel="stylesheet"/>
+<script id="yui-src" src="../../../../branches/yui/build/yui/yui-min.js"></script>
 <script src="../../../../build/config.js"></script>
 <script>
   YUI.GlobalConfig.groups.os.base = '../../../../build/';
   YUI.GlobalConfig.groups.os.filter = 'RAW';
 </script>
-
 <script src="../../../../node_modules/mocha/mocha.js"></script>
 <script src="../../../../node_modules/chai/chai.js"></script>
-
 <script>
   var assert = chai.assert;
   var expect = chai.expect;
@@ -32,7 +29,7 @@
   }
   });
 </script>
-
-<body>
-  <div id="mocha"></div>
+</head><body>
+<div id="mocha"></div>
 </body>
+</html>
\ No newline at end of file

=== modified file 'src/ga-tracking/tests/unit/index.html'
--- src/ga-tracking/tests/unit/index.html	2014-03-13 19:26:30 +0000
+++ src/ga-tracking/tests/unit/index.html	2014-05-15 15:07:26 +0000
@@ -1,18 +1,15 @@
-<!doctype html>
-<meta charset="utf-8" />
+<!DOCTYPE html>
+<html><head><meta charset="utf-8"/>
 <title>ga-tracking Unit Tests</title>
-<link rel="stylesheet" href="../../../../node_modules/mocha/mocha.css">
-
-<script src="../../../../bower_components/yui3/build/yui/yui-min.js"></script>
+<link href="../../../../node_modules/mocha/mocha.css" rel="stylesheet"/>
+<script id="yui-src" src="../../../../branches/yui/build/yui/yui-min.js"></script>
 <script src="../../../../build/config.js"></script>
 <script>
   YUI.GlobalConfig.groups.os.base = '../../../../build/';
   YUI.GlobalConfig.groups.os.filter = 'RAW';
 </script>
-
 <script src="../../../../node_modules/mocha/mocha.js"></script>
 <script src="../../../../node_modules/chai/chai.js"></script>
-
 <script>
   var assert = chai.assert;
   var expect = chai.expect;
@@ -32,7 +29,7 @@
   }
   });
 </script>
-
-<body>
-  <div id="mocha"></div>
+</head><body>
+<div id="mocha"></div>
 </body>
+</html>
\ No newline at end of file

=== modified file 'src/global-navigation/tests/unit/global-nav-yui.html'
--- src/global-navigation/tests/unit/global-nav-yui.html	2014-03-07 14:29:41 +0000
+++ src/global-navigation/tests/unit/global-nav-yui.html	2014-05-15 15:07:26 +0000
@@ -1,7 +1,7 @@
-<!doctype html>
+<!DOCTYPE html>
 <html>
 <head>
-<meta charset="utf-8">
+<meta charset="utf-8"/>
 <title>global-nav Unit Tests</title>
 <script>
 
@@ -12,20 +12,16 @@
 
 </script>
 </head>
-
 <body class="yui3-skin-sam">
-
 <div id="log"></div>
 <div id="test"></div>
-
-<script src="../../../../bower_components/yui3/build/yui/yui-min.js"></script>
+<script id="yui-src" src="../../../../branches/yui/build/yui/yui-min.js"></script>
 <script src="../../../../build/config.js"></script>
-
 <script>
 
   YUI({
     combine: false,
-    base: '../../../../bower_components/yui3/build/',
+    base: '../../../../branches/yui/build/',
     modules: {
       'global-nav-test': {
         fullpath: './assets/global-nav-test.js',

=== modified file 'src/html5-details/tests/unit/index.html'
--- src/html5-details/tests/unit/index.html	2014-03-12 14:09:06 +0000
+++ src/html5-details/tests/unit/index.html	2014-05-15 15:07:26 +0000
@@ -1,18 +1,15 @@
-<!doctype html>
-<meta charset="utf-8" />
+<!DOCTYPE html>
+<html><head><meta charset="utf-8"/>
 <title>html5-details Unit Tests</title>
-<link rel="stylesheet" href="../../../../node_modules/mocha/mocha.css">
-
-<script src="../../../../bower_components/yui3/build/yui/yui-min.js"></script>
+<link href="../../../../node_modules/mocha/mocha.css" rel="stylesheet"/>
+<script id="yui-src" src="../../../../branches/yui/build/yui/yui-min.js"></script>
 <script src="../../../../build/config.js"></script>
 <script>
   YUI.GlobalConfig.groups.os.base = '../../../../build/';
   YUI.GlobalConfig.groups.os.filter = 'RAW';
 </script>
-
 <script src="../../../../node_modules/mocha/mocha.js"></script>
 <script src="../../../../node_modules/chai/chai.js"></script>
-
 <script>
   var assert = chai.assert;
   var expect = chai.expect;
@@ -32,7 +29,7 @@
   }
   });
 </script>
-
-<body>
-  <div id="mocha"></div>
+</head><body>
+<div id="mocha"></div>
 </body>
+</html>
\ No newline at end of file

=== modified file 'src/myapps-hud/tests/unit/index.html'
--- src/myapps-hud/tests/unit/index.html	2014-03-18 11:52:47 +0000
+++ src/myapps-hud/tests/unit/index.html	2014-05-15 15:07:26 +0000
@@ -1,18 +1,15 @@
-<!doctype html>
-<meta charset="utf-8" />
+<!DOCTYPE html>
+<html><head><meta charset="utf-8"/>
 <title>myapps-hud Unit Tests</title>
-<link rel="stylesheet" href="../../../../node_modules/mocha/mocha.css">
-
-<script src="../../../../bower_components/yui3/build/yui/yui-min.js"></script>
+<link href="../../../../node_modules/mocha/mocha.css" rel="stylesheet"/>
+<script id="yui-src" src="../../../../branches/yui/build/yui/yui-min.js"></script>
 <script src="../../../../build/config.js"></script>
 <script>
   YUI.GlobalConfig.groups.os.base = '../../../../build/';
   YUI.GlobalConfig.groups.os.filter = 'RAW';
 </script>
-
 <script src="../../../../node_modules/mocha/mocha.js"></script>
 <script src="../../../../node_modules/chai/chai.js"></script>
-
 <script>
   var assert = chai.assert;
   var expect = chai.expect;
@@ -32,13 +29,13 @@
   }
   });
 </script>
-
-<body>
-  <div id="mocha"></div>
-  <div id="test">
-    <div class="app">
-        <div class="app-hud-wrapper"></div>
-    </div>
-    <div class="footer"></div>
-  </div>
+</head><body>
+<div id="mocha"></div>
+<div id="test">
+<div class="app">
+<div class="app-hud-wrapper"></div>
+</div>
+<div class="footer"></div>
+</div>
 </body>
+</html>
\ No newline at end of file

=== modified file 'src/navbar/tests/unit/index.html'
--- src/navbar/tests/unit/index.html	2014-04-18 16:20:17 +0000
+++ src/navbar/tests/unit/index.html	2014-05-15 15:07:26 +0000
@@ -1,82 +1,73 @@
-<!doctype html>
-<meta charset="utf-8" />
+<!DOCTYPE html>
+<html><head><meta charset="utf-8"/>
 <title>navbar Unit Tests</title>
-<link rel="stylesheet" href="../../../../node_modules/mocha/mocha.css">
-<link rel="stylesheet" href="../../../../branches/ulysses/public/ulysses.css">
-
-<body>
-
-    <div class="ues-navbar" data-qa="navbar-full">
-        <div class="ues-navbar-header">
-            <div class="ues-navbar-brand">
-                <a href="/">[INSERT BRAND IMAGE OR TEXT]</a>
-            </div>
-        </div>
-        <div class="ues-navbar-collapse collapse in">
-            <div class="ues-navbar-primary-nav">
-                <ul class="ues-navbar-menu">
-                    <li><a href="">Dashboard</a></li>
-                    <li><a href="">Files</a></li>
-                    <li><a href="">Photos</a></li>
-                    <li><a href="">Music</a></li>
-                </ul>
-            </div>
-            <div class="ues-navbar-secondary-nav">
-                <ul class="ues-navbar-menu">
-                    <li><a href="">Account</a></li>
-                    <li><a href="">Settings</a></li>
-                    <li><a href="">Logout</a></li>
-                </ul>
-            </div>
-        </div>
-    </div>
-
-    <div class="ues-navbar" data-qa="navbar-search">
-        <div class="ues-navbar-header">
-            <div class="ues-navbar-brand">
-                <a href="/">[INSERT BRAND IMAGE OR TEXT]</a>
-            </div>
-        </div>
-        <div class="ues-navbar-collapse collapse in">
-            <div class="ues-navbar-primary-nav">
-                <ul class="ues-navbar-menu">
-                    <li><a href="">Dashboard</a></li>
-                    <li><a href="">Files</a></li>
-                    <li><a href="">Photos</a></li>
-                    <li><a href="">Music</a></li>
-                </ul>
-            </div>
-            <ul class="ues-navbar-menu">
-                <li><a href="">Account</a></li>
-                <li><a href="">Settings</a></li>
-                <li><a href="">Logout</a></li>
-            </ul>
-        </div>
-        <div class="ues-navbar-collapse search autocomplete collapse in">
-            <div class="ues-navbar-secondary-nav">
-                <div class="ues-navbar-search">
-                    <i class="ues-icon-search orange smaller"></i>
-                    <input class="ues-form-quicksearch" type="search" placeholder="Placeholder">
-                </div>
-            </div>
-        </div>
-    </div>
-
-  <div id="mocha"></div>
+<link href="../../../../node_modules/mocha/mocha.css" rel="stylesheet"/>
+<link href="../../../../branches/ulysses/public/ulysses.css" rel="stylesheet"/>
+</head><body>
+<div class="ues-navbar" data-qa="navbar-full">
+<div class="ues-navbar-header">
+<div class="ues-navbar-brand">
+<a href="/">[INSERT BRAND IMAGE OR TEXT]</a>
+</div>
+</div>
+<div class="ues-navbar-collapse collapse in">
+<div class="ues-navbar-primary-nav">
+<ul class="ues-navbar-menu">
+<li><a href="">Dashboard</a></li>
+<li><a href="">Files</a></li>
+<li><a href="">Photos</a></li>
+<li><a href="">Music</a></li>
+</ul>
+</div>
+<div class="ues-navbar-secondary-nav">
+<ul class="ues-navbar-menu">
+<li><a href="">Account</a></li>
+<li><a href="">Settings</a></li>
+<li><a href="">Logout</a></li>
+</ul>
+</div>
+</div>
+</div>
+<div class="ues-navbar" data-qa="navbar-search">
+<div class="ues-navbar-header">
+<div class="ues-navbar-brand">
+<a href="/">[INSERT BRAND IMAGE OR TEXT]</a>
+</div>
+</div>
+<div class="ues-navbar-collapse collapse in">
+<div class="ues-navbar-primary-nav">
+<ul class="ues-navbar-menu">
+<li><a href="">Dashboard</a></li>
+<li><a href="">Files</a></li>
+<li><a href="">Photos</a></li>
+<li><a href="">Music</a></li>
+</ul>
+</div>
+<ul class="ues-navbar-menu">
+<li><a href="">Account</a></li>
+<li><a href="">Settings</a></li>
+<li><a href="">Logout</a></li>
+</ul>
+</div>
+<div class="ues-navbar-collapse search autocomplete collapse in">
+<div class="ues-navbar-secondary-nav">
+<div class="ues-navbar-search">
+<i class="ues-icon-search orange smaller"></i>
+<input class="ues-form-quicksearch" placeholder="Placeholder" type="search"/>
+</div>
+</div>
+</div>
+</div>
+<div id="mocha"></div>
 </body>
-
-<script src="../../../../bower_components/yui3/build/yui/yui-min.js"></script>
+<script id="yui-src" src="../../../../branches/yui/build/yui/yui-min.js"></script>
 <script src="../../../../build/config.js"></script>
 <script>
   YUI.GlobalConfig.groups.os.base = '../../../../build/';
   YUI.GlobalConfig.groups.os.filter = 'debug';
 </script>
-
 <script src="../../../../node_modules/mocha/mocha.js"></script>
 <script src="../../../../node_modules/chai/chai.js"></script>
-
-
-
 <script>
   var assert = chai.assert;
   var expect = chai.expect;
@@ -96,4 +87,4 @@
   }
   });
 </script>
-
+</html>
\ No newline at end of file

=== modified file 'src/overlay-extras/tests/unit/index.html'
--- src/overlay-extras/tests/unit/index.html	2014-03-12 14:09:06 +0000
+++ src/overlay-extras/tests/unit/index.html	2014-05-15 15:07:26 +0000
@@ -1,18 +1,15 @@
-<!doctype html>
-<meta charset="utf-8" />
+<!DOCTYPE html>
+<html><head><meta charset="utf-8"/>
 <title>overlay-extras Unit Tests</title>
-<link rel="stylesheet" href="../../../../node_modules/mocha/mocha.css">
-
-<script src="../../../../bower_components/yui3/build/yui/yui-min.js"></script>
+<link href="../../../../node_modules/mocha/mocha.css" rel="stylesheet"/>
+<script id="yui-src" src="../../../../branches/yui/build/yui/yui-min.js"></script>
 <script src="../../../../build/config.js"></script>
 <script>
   YUI.GlobalConfig.groups.os.base = '../../../../build/';
   YUI.GlobalConfig.groups.os.filter = 'RAW';
 </script>
-
 <script src="../../../../node_modules/mocha/mocha.js"></script>
 <script src="../../../../node_modules/chai/chai.js"></script>
-
 <script>
   var assert = chai.assert;
   var expect = chai.expect;
@@ -32,7 +29,7 @@
   }
   });
 </script>
-
-<body>
-  <div id="mocha"></div>
+</head><body>
+<div id="mocha"></div>
 </body>
+</html>
\ No newline at end of file

=== modified file 'src/password-meter/tests/unit/password-meter-yui.html'
--- src/password-meter/tests/unit/password-meter-yui.html	2014-03-07 14:29:41 +0000
+++ src/password-meter/tests/unit/password-meter-yui.html	2014-05-15 15:07:26 +0000
@@ -1,7 +1,7 @@
-<!doctype html>
+<!DOCTYPE html>
 <html>
 <head>
-<meta charset="utf-8">
+<meta charset="utf-8"/>
 <title>password-meter</title>
 <script>
 
@@ -14,24 +14,19 @@
 
 </script>
 </head>
-
 <body class="yui3-skin-sam">
-
 <div id="log"></div>
 <div id="test"></div>
-
-<script src="../../../../bower_components/yui3/build/yui/yui-min.js"></script>
+<script id="yui-src" src="../../../../branches/yui/build/yui/yui-min.js"></script>
 <script src="../../../../build/config.js"></script>
-
-<input class="pwd">
-<input class="confirmPwd">
-
+<input class="pwd"/>
+<input class="confirmPwd"/>
 <script>
 
 YUI({
   // use RAW js, overriding whatever is in YUI_config (cf devsettings.py)
   combine:false,
-  base: '../../../../bower_components/yui3/build/',
+  base: '../../../../branches/yui/build/',
   //fetchCSS: false,
   modules: {
     // define a custom module for our tests
@@ -54,7 +49,5 @@
 });
 
 </script>
-
 </body>
 </html>
-

=== modified file 'src/plugin-collapse/tests/unit/index.html'
--- src/plugin-collapse/tests/unit/index.html	2014-03-12 05:08:02 +0000
+++ src/plugin-collapse/tests/unit/index.html	2014-05-15 15:07:26 +0000
@@ -1,24 +1,19 @@
-<!doctype html>
-<meta charset="utf-8" />
+<!DOCTYPE html>
+<html><head><meta charset="utf-8"/>
 <title>plugin-collapse Unit Tests</title>
-<link rel="stylesheet" href="../../../../node_modules/mocha/mocha.css">
-
-<body>
+<link href="../../../../node_modules/mocha/mocha.css" rel="stylesheet"/>
+</head><body>
 <div class="test">this is some stuff</div>
-  <div id="mocha"></div>
+<div id="mocha"></div>
 </body>
-
-<script src="../../../../bower_components/yui3/build/yui/yui-min.js"></script>
+<script id="yui-src" src="../../../../branches/yui/build/yui/yui-min.js"></script>
 <script src="../../../../build/config.js"></script>
 <script>
   YUI.GlobalConfig.groups.os.base = '../../../../build/';
   YUI.GlobalConfig.groups.os.filter = 'RAW';
 </script>
-
-
 <script src="../../../../node_modules/mocha/mocha.js"></script>
 <script src="../../../../node_modules/chai/chai.js"></script>
-
 <script>
   var assert = chai.assert;
   var expect = chai.expect;
@@ -28,9 +23,7 @@
   mocha.ui('bdd');
   mocha.setup({ignoreLeaks: false, timeout: 10000});
 </script>
-
 <script src="js/tests.js"></script>
-
 <script>
 YUI().use('node', function(Y) {
   if (window.mochaPhantomJS) {
@@ -40,4 +33,4 @@
   }
   });
 </script>
-
+</html>
\ No newline at end of file

=== modified file 'src/plugin-jit-bar/tests/unit/plugin-jit-bar-yui.html'
--- src/plugin-jit-bar/tests/unit/plugin-jit-bar-yui.html	2014-03-07 14:29:41 +0000
+++ src/plugin-jit-bar/tests/unit/plugin-jit-bar-yui.html	2014-05-15 15:07:26 +0000
@@ -1,7 +1,7 @@
-<!doctype html>
+<!DOCTYPE html>
 <html>
 <head>
-<meta charset="utf-8">
+<meta charset="utf-8"/>
 <title>Plugin-Jit-Bar Tests</title>
 <script>
 
@@ -14,21 +14,17 @@
 
 </script>
 </head>
-
 <body class="yui3-skin-sam">
-
 <div id="log"></div>
 <div id="test"></div>
-
-<script src="../../../../bower_components/yui3/build/yui/yui-min.js"></script>
+<script id="yui-src" src="../../../../branches/yui/build/yui/yui-min.js"></script>
 <script src="../../../../build/config.js"></script>
-
 <script>
 
 YUI({
   // use RAW js, overriding whatever is in YUI_config (cf devsettings.py)
   combine:false,
-  base: '../../../../bower_components/yui3/build/',
+  base: '../../../../branches/yui/build/',
   //fetchCSS: false,
   modules: {
     // define a custom module for our tests
@@ -51,7 +47,5 @@
 });
 
 </script>
-
 </body>
 </html>
-

=== modified file 'src/rangyinputs/tests/unit/rangyinputs-yui.html'
--- src/rangyinputs/tests/unit/rangyinputs-yui.html	2014-03-07 14:29:41 +0000
+++ src/rangyinputs/tests/unit/rangyinputs-yui.html	2014-05-15 15:07:26 +0000
@@ -1,7 +1,7 @@
-<!doctype html>
+<!DOCTYPE html>
 <html>
 <head>
-<meta charset="utf-8">
+<meta charset="utf-8"/>
 <title>Rangyinputs Unit Tests</title>
 <script>
 
@@ -12,20 +12,16 @@
 
 </script>
 </head>
-
 <body class="yui3-skin-sam">
-
 <div id="log"></div>
-<input id="test">
-
-<script src="../../../../bower_components/yui3/build/yui/yui-min.js"></script>
+<input id="test"/>
+<script id="yui-src" src="../../../../branches/yui/build/yui/yui-min.js"></script>
 <script src="../../../../build/config.js"></script>
-
 <script>
 
   YUI({
     combine: false,
-    base: '../../../../bower_components/yui3/build/',
+    base: '../../../../branches/yui/build/',
     modules: {
       'rangyinputs-test': {
         fullpath: './assets/rangyinputs.js',

=== modified file 'src/searchbar/tests/unit/index.html'
--- src/searchbar/tests/unit/index.html	2014-05-14 09:49:12 +0000
+++ src/searchbar/tests/unit/index.html	2014-05-15 15:07:26 +0000
@@ -1,33 +1,25 @@
-<!doctype html>
-<meta charset="utf-8" />
+<!DOCTYPE html>
+<html><head><meta charset="utf-8"/>
 <title>searchbar Unit Tests</title>
-<link rel="stylesheet" href="../../../../node_modules/mocha/mocha.css">
-<link rel="stylesheet" href="../../../../branches/ulysses/public/ulysses.css">
-
-<body>
-
-
-  <div id="mocha"></div>
+<link href="../../../../node_modules/mocha/mocha.css" rel="stylesheet"/>
+<link href="../../../../branches/ulysses/public/ulysses.css" rel="stylesheet"/>
+</head><body>
+<div id="mocha"></div>
 </body>
-
-<script src="../../../../bower_components/yui3/build/yui/yui-min.js"></script>
+<script id="yui-src" src="../../../../branches/yui/build/yui/yui-min.js"></script>
 <script src="../../../../build/config.js"></script>
 <script>
   YUI.GlobalConfig.groups.os.base = '../../../../build/';
   YUI.GlobalConfig.groups.os.filter = 'debug';
 </script>
-
 <script src="../../../../node_modules/mocha/mocha.js"></script>
 <script src="../../../../node_modules/chai/chai.js"></script>
-
-<div id="searchbar" class="ues-searchbar" data-qa="searchbar-autocomplete">
-    <div class="ues-searchbar-search">
-        <i class="ues-icon-search orange smaller"></i>
-        <input class="ues-form-quicksearch" type="search" placeholder="Placeholder">
-    </div>
-</div>
-
-
+<div class="ues-searchbar" data-qa="searchbar-autocomplete" id="searchbar">
+<div class="ues-searchbar-search">
+<i class="ues-icon-search orange smaller"></i>
+<input class="ues-form-quicksearch" placeholder="Placeholder" type="search"/>
+</div>
+</div>
 <script>
   var assert = chai.assert;
   var expect = chai.expect;
@@ -51,4 +43,4 @@
   }
   });
 </script>
-
+</html>
\ No newline at end of file

=== modified file 'src/uploader-augmented/tests/unit/uploader-tests-yui.html'
--- src/uploader-augmented/tests/unit/uploader-tests-yui.html	2014-03-12 20:41:35 +0000
+++ src/uploader-augmented/tests/unit/uploader-tests-yui.html	2014-05-15 15:07:26 +0000
@@ -1,7 +1,7 @@
-<!doctype html>
+<!DOCTYPE html>
 <html>
 <head>
-<meta charset="utf-8">
+<meta charset="utf-8"/>
 <title>uploader-augmented tests</title>
 <script>
 
@@ -14,23 +14,18 @@
 
 </script>
 </head>
-
 <body class="yui3-skin-sam">
-
 <div id="log"></div>
 <div id="test"></div>
-
-<script src="../../../../bower_components/yui3/build/yui/yui-min.js"></script>
+<script id="yui-src" src="../../../../branches/yui/build/yui/yui-min.js"></script>
 <script src="../../../../build/config.js"></script>
-
 <div class="uploader"></div>
-
 <script>
 
 YUI({
   // use RAW js, overriding whatever is in YUI_config (cf devsettings.py)
   combine:false,
-  base: '../../../../bower_components/yui3/build/',
+  base: '../../../../branches/yui/build/',
   //fetchCSS: false,
   modules: {
     // define a custom module for our tests
@@ -53,7 +48,5 @@
 });
 
 </script>
-
 </body>
 </html>
-

=== modified file 'src/uploader-myapps-packages-for-extraction/tests/unit/index.html'
--- src/uploader-myapps-packages-for-extraction/tests/unit/index.html	2014-03-12 20:41:35 +0000
+++ src/uploader-myapps-packages-for-extraction/tests/unit/index.html	2014-05-15 15:07:26 +0000
@@ -1,18 +1,15 @@
-<!doctype html>
-<meta charset="utf-8" />
+<!DOCTYPE html>
+<html><head><meta charset="utf-8"/>
 <title>uploader-myapps-packages-for-extraction Unit Tests</title>
-<link rel="stylesheet" href="../../../../node_modules/mocha/mocha.css">
-
-<script src="../../../../bower_components/yui3/build/yui/yui-min.js"></script>
+<link href="../../../../node_modules/mocha/mocha.css" rel="stylesheet"/>
+<script id="yui-src" src="../../../../branches/yui/build/yui/yui-min.js"></script>
 <script src="../../../../build/config.js"></script>
 <script>
   YUI.GlobalConfig.groups.os.base = '../../../../build/';
   YUI.GlobalConfig.groups.os.filter = 'RAW';
 </script>
-
 <script src="../../../../node_modules/mocha/mocha.js"></script>
 <script src="../../../../node_modules/chai/chai.js"></script>
-
 <script>
   var assert = chai.assert;
   var expect = chai.expect;
@@ -32,7 +29,7 @@
   }
   });
 </script>
-
-<body>
-  <div id="mocha"></div>
+</head><body>
+<div id="mocha"></div>
 </body>
+</html>
\ No newline at end of file

=== modified file 'src/uploader-myapps-packages/tests/unit/index.html'
--- src/uploader-myapps-packages/tests/unit/index.html	2014-03-12 20:41:35 +0000
+++ src/uploader-myapps-packages/tests/unit/index.html	2014-05-15 15:07:26 +0000
@@ -1,18 +1,15 @@
-<!doctype html>
-<meta charset="utf-8" />
+<!DOCTYPE html>
+<html><head><meta charset="utf-8"/>
 <title>uploader-myapps-packages Unit Tests</title>
-<link rel="stylesheet" href="../../../../node_modules/mocha/mocha.css">
-
-<script src="../../../../bower_components/yui3/build/yui/yui-min.js"></script>
+<link href="../../../../node_modules/mocha/mocha.css" rel="stylesheet"/>
+<script id="yui-src" src="../../../../branches/yui/build/yui/yui-min.js"></script>
 <script src="../../../../build/config.js"></script>
 <script>
   YUI.GlobalConfig.groups.os.base = '../../../../build/';
   YUI.GlobalConfig.groups.os.filter = 'RAW';
 </script>
-
 <script src="../../../../node_modules/mocha/mocha.js"></script>
 <script src="../../../../node_modules/chai/chai.js"></script>
-
 <script>
   var assert = chai.assert;
   var expect = chai.expect;
@@ -32,7 +29,7 @@
   }
   });
 </script>
-
-<body>
-  <div id="mocha"></div>
+</head><body>
+<div id="mocha"></div>
 </body>
+</html>
\ No newline at end of file

=== modified file 'src/uploader-myapps/tests/unit/index.html'
--- src/uploader-myapps/tests/unit/index.html	2014-03-12 20:41:35 +0000
+++ src/uploader-myapps/tests/unit/index.html	2014-05-15 15:07:26 +0000
@@ -1,18 +1,15 @@
-<!doctype html>
-<meta charset="utf-8" />
+<!DOCTYPE html>
+<html><head><meta charset="utf-8"/>
 <title>uploader-myapps Unit Tests</title>
-<link rel="stylesheet" href="../../../../node_modules/mocha/mocha.css">
-
-<script src="../../../../bower_components/yui3/build/yui/yui-min.js"></script>
+<link href="../../../../node_modules/mocha/mocha.css" rel="stylesheet"/>
+<script id="yui-src" src="../../../../branches/yui/build/yui/yui-min.js"></script>
 <script src="../../../../build/config.js"></script>
 <script>
   YUI.GlobalConfig.groups.os.base = '../../../../build/';
   YUI.GlobalConfig.groups.os.filter = 'RAW';
 </script>
-
 <script src="../../../../node_modules/mocha/mocha.js"></script>
 <script src="../../../../node_modules/chai/chai.js"></script>
-
 <script>
   var assert = chai.assert;
   var expect = chai.expect;
@@ -32,7 +29,7 @@
   }
   });
 </script>
-
-<body>
-  <div id="mocha"></div>
+</head><body>
+<div id="mocha"></div>
 </body>
+</html>
\ No newline at end of file

=== modified file 'src/util/tests/unit/oops-yui.html'
--- src/util/tests/unit/oops-yui.html	2014-03-07 14:29:41 +0000
+++ src/util/tests/unit/oops-yui.html	2014-05-15 15:07:26 +0000
@@ -1,7 +1,7 @@
-<!doctype html>
+<!DOCTYPE html>
 <html>
 <head>
-<meta charset="utf-8">
+<meta charset="utf-8"/>
 <title>util-oops</title>
 <script>
 
@@ -14,22 +14,18 @@
 
 </script>
 </head>
-
 <body class="yui3-skin-sam">
-
 <div id="log"></div>
 <div id="test"></div>
-
-<script src="../../../../bower_components/yui3/build/yui/yui-min.js"></script>
+<script id="yui-src" src="../../../../branches/yui/build/yui/yui-min.js"></script>
 <script src="../../../../build/config.js"></script>
-
 <script>
 
 YUI({
   coverage: ['util-oops'],
   // use RAW js, overriding whatever is in YUI_config (cf devsettings.py)
   combine:0,
-  base: '../../../../bower_components/yui3/build/',
+  base: '../../../../branches/yui/build/',
   //fetchCSS: false,
   modules: {
     // define a custom module for our tests
@@ -52,7 +48,5 @@
 });
 
 </script>
-
 </body>
 </html>
-

=== modified file 'src/util/tests/unit/util-yui.html'
--- src/util/tests/unit/util-yui.html	2014-03-07 14:29:41 +0000
+++ src/util/tests/unit/util-yui.html	2014-05-15 15:07:26 +0000
@@ -1,7 +1,7 @@
-<!doctype html>
+<!DOCTYPE html>
 <html>
 <head>
-<meta charset="utf-8">
+<meta charset="utf-8"/>
 <title>Util Tests</title>
 <script>
 
@@ -14,22 +14,18 @@
 
 </script>
 </head>
-
 <body class="yui3-skin-sam">
-
 <div id="log"></div>
 <div id="test"></div>
-
-<script src="../../../../bower_components/yui3/build/yui/yui-min.js"></script>
+<script id="yui-src" src="../../../../branches/yui/build/yui/yui-min.js"></script>
 <script src="../../../../build/config.js"></script>
-
 <script>
 
 YUI({
   coverage: ['util-share'],
   // use RAW js, overriding whatever is in YUI_config (cf devsettings.py)
   combine:0,
-  base: '../../../../bower_components/yui3/build/',
+  base: '../../../../branches/yui/build/',
   //fetchCSS: false,
   modules: {
     // define a custom module for our tests
@@ -52,7 +48,5 @@
 });
 
 </script>
-
 </body>
 </html>
-

=== modified file 'src/widget-cc-input/tests/unit/index-yui.html'
--- src/widget-cc-input/tests/unit/index-yui.html	2014-03-07 14:29:41 +0000
+++ src/widget-cc-input/tests/unit/index-yui.html	2014-05-15 15:07:26 +0000
@@ -1,7 +1,7 @@
-<!doctype html>
+<!DOCTYPE html>
 <html>
 <head>
-<meta charset="utf-8">
+<meta charset="utf-8"/>
 <title>Unit Tests</title>
 <script>
 
@@ -14,54 +14,46 @@
 
 </script>
 </head>
-
 <body class="yui3-skin-sam">
-
 <form action="#">
-  <div class=ccinput>
-
-    <div class=ccinput-input-container>
-      <input type=text class=ccinput-ccn autocomplete=off />
-      <select class=ccinput-issuer autocomplete=off>
-        <option name="visa">Visa</option>
-        <option name="mastercard">Mastercard</option>
-        <option name="amex">American Express</option>
-        <option name="discover">Discover</option>
-        <option name="diners">Diners</option>
-        <option name="jcb">JCB</option>
-        <option name="dankort">Dankort</option>
-      </select>
-      <input type=text class=ccinput-expires autocomplete=off />
-      <input type=text class=ccinput-csc autocomplete=off />
-    </div>
-
-    <div class=ccinput-mask-container><div class=ccinput-guide><span class=ccinput-ccn></span><span>&nbsp;&nbsp;&nbsp;</span><span class=ccinput-date></span><span>&nbsp;&nbsp;&nbsp;</span><span class=ccinput-csc></span></div>
-      <input type=tel class=ccinput-mask autocomplete=off>
-    </div>
-    <div class=ccinput-message>
-      <div class=ccinput-valid>✓</div>
-      <ul class=ccinput-error>
-        <li>Sorry, card number is from unrecognised/invalid provider, we accept Visa, Mastercard, American Express, Diners, Discovery, JCB, and Dankort.</li>
-        <li>Card number is invalid, please check and try again</li>
-        <li>Date is invalid, must be valid month and year (MMYY)</li>
-        <li>Card Security Code/Number is too short</li>
-      </ul>
-    </div>
-    <div class=ccinput-button></div>
-
-  </div>
+<div class="ccinput">
+<div class="ccinput-input-container">
+<input autocomplete="off" class="ccinput-ccn" type="text"/>
+<select autocomplete="off" class="ccinput-issuer">
+<option name="visa">Visa</option>
+<option name="mastercard">Mastercard</option>
+<option name="amex">American Express</option>
+<option name="discover">Discover</option>
+<option name="diners">Diners</option>
+<option name="jcb">JCB</option>
+<option name="dankort">Dankort</option>
+</select>
+<input autocomplete="off" class="ccinput-expires" type="text"/>
+<input autocomplete="off" class="ccinput-csc" type="text"/>
+</div>
+<div class="ccinput-mask-container"><div class="ccinput-guide"><span class="ccinput-ccn"></span><span>   </span><span class="ccinput-date"></span><span>   </span><span class="ccinput-csc"></span></div>
+<input autocomplete="off" class="ccinput-mask" type="tel"/>
+</div>
+<div class="ccinput-message">
+<div class="ccinput-valid">✓</div>
+<ul class="ccinput-error">
+<li>Sorry, card number is from unrecognised/invalid provider, we accept Visa, Mastercard, American Express, Diners, Discovery, JCB, and Dankort.</li>
+<li>Card number is invalid, please check and try again</li>
+<li>Date is invalid, must be valid month and year (MMYY)</li>
+<li>Card Security Code/Number is too short</li>
+</ul>
+</div>
+<div class="ccinput-button"></div>
+</div>
 </form>
-
 <div id="test"></div>
-
-<script src="../../../../bower_components/yui3/build/yui/yui-min.js"></script>
+<script id="yui-src" src="../../../../branches/yui/build/yui/yui-min.js"></script>
 <script src="../../../../build/config.js"></script>
 <script src="./assets/input.js"></script>
-
 <script>
 
 YUI({
-  base: '../../../../bower_components/yui3/build/',
+  base: '../../../../branches/yui/build/',
   combine:0,
   groups: {
     'os': {
@@ -80,7 +72,5 @@
 });
 
 </script>
-
 </body>
 </html>
-

=== added file 'tarmac_verify.sh'
--- tarmac_verify.sh	1970-01-01 00:00:00 +0000
+++ tarmac_verify.sh	2014-05-15 15:07:26 +0000
@@ -0,0 +1,6 @@
+#!/bin/bash -e
+GRUNT=./node_modules/.bin/grunt
+
+npm --silent i
+
+$GRUNT --no-color verify