diff --git a/.gitignore b/.gitignore index d9662ee9f5..f3c3a91fbb 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,6 @@ resources/boot2docker* cache resources/settings* + +# Tests +.test diff --git a/.jshintrc b/.jshintrc index 89d89340b9..9240a3ae9f 100644 --- a/.jshintrc +++ b/.jshintrc @@ -23,7 +23,9 @@ "camelcase": false, "jasmine": true, "globals": { - "define": true + "define": true, + "jest": true, + "pit": true }, "predef": [ "-Promise" ] } diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000000..20fd86b6a5 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,3 @@ +language: node_js +node_js: + - 0.10 diff --git a/README.md b/README.md index 2987c0eb97..36e73ab275 100755 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![bitHound Score](https://app.bithound.io/kitematic/kitematic/badges/score.svg)](http://app.bithound.io/kitematic/kitematic) +[![Build Status](https://travis-ci.org/kitematic/kitematic.svg)](https://travis-ci.org/kitematic/kitematic) [![bitHound Score](https://app.bithound.io/kitematic/kitematic/badges/score.svg)](http://app.bithound.io/kitematic/kitematic) ![Kitematic Logo](https://cloud.githubusercontent.com/assets/251292/5269258/1b229c3c-7a2f-11e4-96f1-e7baf3c86d73.png) diff --git a/__tests__/Boot2Docker-test.js b/__tests__/Boot2Docker-test.js new file mode 100644 index 0000000000..897b427194 --- /dev/null +++ b/__tests__/Boot2Docker-test.js @@ -0,0 +1,37 @@ +jest.dontMock('../src/Boot2Docker'); +var boot2docker = require('../src/Boot2Docker'); + +var fs = require('fs'); +var util = require('../src/Util'); +var Promise = require('bluebird'); + +describe('Boot2Docker', () => { + pit('cli version is parsed correctly', function () { + util.exec.mockReturnValueOnce(Promise.resolve('Boot2Docker-cli version: v1.4.1\nGit commit: 43241cb')); + return boot2docker.cliversion().then(version => { + expect(util.exec).toBeCalledWith([boot2docker.command(), 'version']); + expect(version).toBe('1.4.1'); + }); + }); + + it('iso version parsed correctly', function () { + fs.readFileSync.mockReturnValueOnce('9adjaldijaslkjd123Boot2Docker-v1.4.1aisudhha82jj123'); + expect(boot2docker.isoversion()).toBe('1.4.1'); + }); + + pit('should exist if status command succeeds', function () { + util.exec.mockReturnValueOnce(Promise.resolve(true)); + return boot2docker.exists().then(exists => { + expect(util.exec).toBeCalledWith([boot2docker.command(), 'status']); + expect(exists).toBe(true); + }); + }); + + pit('should not exist if status command fails', function () { + util.exec.mockReturnValueOnce(Promise.reject(false)); + return boot2docker.exists().then(exists => { + expect(util.exec).toBeCalledWith([boot2docker.command(), 'status']); + expect(exists).toBe(false); + }); + }); +}); diff --git a/__tests__/Virtualbox-test.js b/__tests__/Virtualbox-test.js new file mode 100644 index 0000000000..e8f4a2fe72 --- /dev/null +++ b/__tests__/Virtualbox-test.js @@ -0,0 +1,21 @@ +jest.dontMock('../src/Virtualbox'); +var virtualbox = require('../src/Virtualbox'); +var util = require('../src/Util'); +var Promise = require('bluebird'); + +describe('Virtualbox', function () { + it('returns the right command', function () { + expect(virtualbox.command()).toBe('/usr/bin/VBoxManage'); + }); + + describe('version 4.3.20r96996', function () { + pit('correctly parses virtualbox version', function () { + util.exec.mockImplementation(function () { + return Promise.resolve('4.3.20r96996'); + }); + return virtualbox.version().then(function (version) { + expect(version).toBe('4.3.20'); + }); + }); + }); +}); diff --git a/browser/main.js b/browser/main.js index 9a92d90b3e..4ecb4688c8 100644 --- a/browser/main.js +++ b/browser/main.js @@ -21,6 +21,16 @@ if (argv.integration) { app.commandLine.appendSwitch('js-flags', '--harmony'); var mainWindow = null; +var windowOptions = { + width: 1000, + height: 700, + 'min-width': 1000, + 'min-height': 700, + resizable: true, + frame: false, + show: false +}; + app.on('activate-with-no-open-windows', function () { if (mainWindow) { mainWindow.show(); @@ -28,19 +38,9 @@ app.on('activate-with-no-open-windows', function () { return false; }); -app.on('ready', function () { - mainWindow = new BrowserWindow({ - width: 1000, - height: 700, - 'min-width': 1000, - 'min-height': 700, - resizable: true, - frame: false, - show: false - }); - +app.on('ready', function() { + mainWindow = new BrowserWindow(windowOptions); var saveVMOnQuit = false; - if (argv.test) { mainWindow.loadUrl(path.normalize('file://' + path.join(__dirname, '..', 'build/tests.html'))); } else { @@ -83,6 +83,7 @@ app.on('ready', function () { autoUpdater.on('update-downloaded', function (e, releaseNotes, releaseName, releaseDate, updateURL) { console.log(e, releaseNotes, releaseName, releaseDate, updateURL); console.log('Update downloaded.'); + console.log(releaseNotes, releaseName, releaseDate, updateURL); mainWindow.webContents.send('notify', 'window:update-available'); }); diff --git a/gulpfile.js b/gulpfile.js index be42980fb4..7dcbbc3729 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -28,37 +28,19 @@ var options = { }; gulp.task('js', function () { - gulp.src('src/**/*.js') + return gulp.src('src/**/*.js') .pipe(plumber(function(error) { gutil.log(gutil.colors.red('Error (' + error.plugin + '): ' + error.message)); - // emit the end event, to properly end the task this.emit('end'); })) - .pipe(sourcemaps.init()) + .pipe(gulpif(options.dev || options.test, sourcemaps.init())) .pipe(react()) .pipe(to5({blacklist: ['regenerator']})) - .pipe(sourcemaps.write('.')) + .pipe(gulpif(options.dev || options.test, sourcemaps.write('.'))) .pipe(gulp.dest((options.dev || options.test) ? './build' : './dist/osx/' + options.filename + '/Contents/Resources/app/build')) .pipe(gulpif(options.dev, livereload())); }); -gulp.task('tests', function () { - gulp.src('tests/*.js') - .pipe(plumber(function(error) { - gutil.log(gutil.colors.red('Error (' + error.plugin + '): ' + error.message)); - // emit the end event, to properly end the task - this.emit('end'); - })) - .pipe(sourcemaps.init()) - .pipe(react()) - .pipe(to5()) - .pipe(sourcemaps.write('.')) - .pipe(gulp.dest('./build')); - - gulp.src('./tests/tests.html').pipe(gulp.dest('./build')); - gulp.src('./tests/jasmine-2.1.3/*').pipe(gulp.dest('./build/jasmine-2.1.3')); -}); - gulp.task('images', function() { return gulp.src('images/*') .pipe(gulp.dest(options.dev ? './build' : './dist/osx/' + options.filename + '/Contents/Resources/app/build')) @@ -165,20 +147,6 @@ gulp.task('release', function () { runSequence('download', 'dist', ['copy', 'images', 'js', 'styles'], 'sign', 'zip'); }); -gulp.task('test', ['download', 'copy', 'js', 'tests'], function () { - var env = process.env; - env.NODE_ENV = 'test'; - if (options.integration) { - gulp.src('').pipe(shell(['./cache/Atom.app/Contents/MacOS/Atom . --test --integration'], { - env: env - })); - } else { - gulp.src('').pipe(shell(['./cache/Atom.app/Contents/MacOS/Atom . --test'], { - env: env - })); - } -}); - gulp.task('default', ['download', 'copy', 'js', 'images', 'styles'], function () { gulp.watch('src/**/*.js', ['js']); gulp.watch('index.html', ['copy']); diff --git a/images/boot2docker.png b/images/boot2docker.png index 947896617d..8f4282e7fb 100644 Binary files a/images/boot2docker.png and b/images/boot2docker.png differ diff --git a/images/boot2docker@2x.png b/images/boot2docker@2x.png index 54d2f03695..808f616984 100644 Binary files a/images/boot2docker@2x.png and b/images/boot2docker@2x.png differ diff --git a/images/button-restart.png b/images/button-restart.png new file mode 100644 index 0000000000..988cdbcd80 Binary files /dev/null and b/images/button-restart.png differ diff --git a/images/button-restart@2x.png b/images/button-restart@2x.png new file mode 100644 index 0000000000..f4e3151525 Binary files /dev/null and b/images/button-restart@2x.png differ diff --git a/images/button-run.png b/images/button-run.png new file mode 100644 index 0000000000..1d03b2c5fc Binary files /dev/null and b/images/button-run.png differ diff --git a/images/button-run@2x.png b/images/button-run@2x.png new file mode 100644 index 0000000000..a5b8a22f69 Binary files /dev/null and b/images/button-run@2x.png differ diff --git a/images/button-terminal.png b/images/button-terminal.png new file mode 100644 index 0000000000..d988e3a569 Binary files /dev/null and b/images/button-terminal.png differ diff --git a/images/button-terminal@2x.png b/images/button-terminal@2x.png new file mode 100644 index 0000000000..e96502aa66 Binary files /dev/null and b/images/button-terminal@2x.png differ diff --git a/images/close.png b/images/close.png index 4551a82a0e..0f003a7838 100644 Binary files a/images/close.png and b/images/close.png differ diff --git a/images/close@2x.png b/images/close@2x.png index 30793ab48f..548edccb5f 100644 Binary files a/images/close@2x.png and b/images/close@2x.png differ diff --git a/images/container-white.png b/images/container-white.png new file mode 100644 index 0000000000..e5b5b2149f Binary files /dev/null and b/images/container-white.png differ diff --git a/images/container-white@2x.png b/images/container-white@2x.png new file mode 100644 index 0000000000..0b2c76efd5 Binary files /dev/null and b/images/container-white@2x.png differ diff --git a/images/container.png b/images/container.png new file mode 100644 index 0000000000..db6dc21e68 Binary files /dev/null and b/images/container.png differ diff --git a/images/container@2x.png b/images/container@2x.png new file mode 100644 index 0000000000..0fbb4ac03b Binary files /dev/null and b/images/container@2x.png differ diff --git a/images/folder.png b/images/folder.png new file mode 100644 index 0000000000..4d0eb553ff Binary files /dev/null and b/images/folder.png differ diff --git a/images/folder@2x.png b/images/folder@2x.png new file mode 100644 index 0000000000..96517b6595 Binary files /dev/null and b/images/folder@2x.png differ diff --git a/images/fullscreen.png b/images/fullscreen.png index 284cb69a72..f668cd086d 100644 Binary files a/images/fullscreen.png and b/images/fullscreen.png differ diff --git a/images/fullscreen@2x.png b/images/fullscreen@2x.png index 447372fdb0..e9cd61e3c1 100644 Binary files a/images/fullscreen@2x.png and b/images/fullscreen@2x.png differ diff --git a/images/fullscreenclose.png b/images/fullscreenclose.png index d3d6543be4..8d8fe9ecdf 100644 Binary files a/images/fullscreenclose.png and b/images/fullscreenclose.png differ diff --git a/images/fullscreenclose@2x.png b/images/fullscreenclose@2x.png new file mode 100644 index 0000000000..5feee7a995 Binary files /dev/null and b/images/fullscreenclose@2x.png differ diff --git a/images/install-error.png b/images/install-error.png new file mode 100644 index 0000000000..15f6dca227 Binary files /dev/null and b/images/install-error.png differ diff --git a/images/install-error@2x.png b/images/install-error@2x.png new file mode 100644 index 0000000000..357c1cbd75 Binary files /dev/null and b/images/install-error@2x.png differ diff --git a/images/loading.png b/images/loading.png index 6217c07530..6d8e975938 100644 Binary files a/images/loading.png and b/images/loading.png differ diff --git a/images/loading@2x.png b/images/loading@2x.png index 102eae7805..87a14647c4 100644 Binary files a/images/loading@2x.png and b/images/loading@2x.png differ diff --git a/images/logo.png b/images/logo.png new file mode 100644 index 0000000000..e7817078cd Binary files /dev/null and b/images/logo.png differ diff --git a/images/logo@2x.png b/images/logo@2x.png new file mode 100644 index 0000000000..51b2e73f68 Binary files /dev/null and b/images/logo@2x.png differ diff --git a/images/minimize.png b/images/minimize.png index 731b123eb7..1057e819c4 100644 Binary files a/images/minimize.png and b/images/minimize.png differ diff --git a/images/minimize@2x.png b/images/minimize@2x.png index feb342d58c..faf94847ca 100644 Binary files a/images/minimize@2x.png and b/images/minimize@2x.png differ diff --git a/images/running 2.png b/images/running 2.png new file mode 100644 index 0000000000..4a81d6da97 Binary files /dev/null and b/images/running 2.png differ diff --git a/images/running 2@2x.png b/images/running 2@2x.png new file mode 100644 index 0000000000..f72445227e Binary files /dev/null and b/images/running 2@2x.png differ diff --git a/images/running.png b/images/running.png index ea129def4f..f54d02e9d2 100644 Binary files a/images/running.png and b/images/running.png differ diff --git a/images/running@2x.png b/images/running@2x.png index b2777164bf..43517a2c30 100644 Binary files a/images/running@2x.png and b/images/running@2x.png differ diff --git a/images/runningwave.png b/images/runningwave.png index d65fc18e13..eb7bfc8e2e 100644 Binary files a/images/runningwave.png and b/images/runningwave.png differ diff --git a/images/runningwave@2x.png b/images/runningwave@2x.png index bb2a5ef49f..6293314b0b 100644 Binary files a/images/runningwave@2x.png and b/images/runningwave@2x.png differ diff --git a/images/virtualbox.png b/images/virtualbox.png index 7a5f540ffd..fb9191d0ea 100644 Binary files a/images/virtualbox.png and b/images/virtualbox.png differ diff --git a/images/virtualbox@2x.png b/images/virtualbox@2x.png index ad3436f04e..823b8b8d27 100644 Binary files a/images/virtualbox@2x.png and b/images/virtualbox@2x.png differ diff --git a/package.json b/package.json index ab5fe8e3b0..a7566e1948 100644 --- a/package.json +++ b/package.json @@ -12,12 +12,11 @@ "bugs": "https://github.com/kitematic/kitematic/issues", "scripts": { "start": "gulp", - "test": "gulp test", - "test:integration": "gulp test --integration", - "test:all": "npm test && npm run test:integration", + "test": "jest", "release": "gulp release", "release:beta": "gulp release --beta", - "preinstall": "./deps" + "preinstall": "./deps", + "lint": "jsxhint src/**/* && jsxhint browser/**/*" }, "licenses": [ { @@ -26,16 +25,19 @@ } ], "jest": { + "scriptPreprocessor": "preprocessor.js", "unmockedModulePathPatterns": [ - "dockerode", - "react", - "debug" + "node_modules/request", + "node_modules/react", + "node_modules/bluebird", + "node_modules/6to5" ] }, "boot2docker-version": "1.4.1", "atom-shell-version": "0.21.1", "virtualbox-version": "4.3.20", - "virtualbox-filename": "VirtualBox-4.3.20-96996-OSX.dmg", + "virtualbox-filename": "VirtualBox-4.3.20.pkg", + "virtualbox-checksum": "89edac4cc7298c8a04fd4bb646ff2197e7673137c6566c7757f0e9cd6265d0c5", "virtualbox-required-version": "4.3.18", "dependencies": { "ansi-to-html": "0.2.0", @@ -44,6 +46,7 @@ "bugsnag-js": "git+https://git@github.com/bugsnag/bugsnag-js", "dockerode": "2.0.4", "exec": "0.1.2", + "html2canvas": "^0.5.0-alpha2", "jquery": "^2.1.3", "minimist": "^1.1.0", "node-uuid": "1.4.1", @@ -61,6 +64,9 @@ "underscore": "^1.7.0" }, "devDependencies": { + "6to5": "^3.4.1", + "6to5-core": "^3.4.1", + "6to5-jest": "^3.0.0", "browserify": "^6.2.0", "ecstatic": "^0.5.8", "glob": "^4.0.6", @@ -83,11 +89,14 @@ "gulp-uglify": "^0.3.1", "gulp-uglifyjs": "^0.5.0", "gulp-util": "^3.0.0", + "jest-cli": "^0.2.2", + "merge-stream": "^0.1.7", + "react-tools": "^0.12.2", "reactify": "^0.15.2", + "regenerator": "^0.8.9", "run-sequence": "^1.0.2", "time-require": "^0.1.2", "vinyl-source-stream": "^0.1.1", - "watchify": "^2.1.1", - "zombie": "^2.5.1" + "watchify": "^2.1.1" } } diff --git a/preprocessor.js b/preprocessor.js new file mode 100644 index 0000000000..5e45b168f0 --- /dev/null +++ b/preprocessor.js @@ -0,0 +1,14 @@ +var ReactTools = require('react-tools'); + +module.exports = { + process: function(src, filename) { + if (filename.indexOf('node_modules') === -1) { + var res = ReactTools.transform(require('6to5').transform(src).code); + if (filename.indexOf('-test') !== -1) { + res = 'require(\'6to5/polyfill\');' + res; + } + return res; + } + return src; + } +}; diff --git a/settings.json b/settings.json new file mode 100644 index 0000000000..ef3ae13771 --- /dev/null +++ b/settings.json @@ -0,0 +1,5 @@ +{ + "bugsnag": "fc51aab02ce9dd1bb6ebc9fe2f4d43d7", + "mixpanel": "114caa6b42de655c4671c4b1e69f1b81", + "beta": true +} diff --git a/src/Boot2Docker.js b/src/Boot2Docker.js index 2187130c45..7a8b8acbc7 100644 --- a/src/Boot2Docker.js +++ b/src/Boot2Docker.js @@ -1,12 +1,20 @@ +var _ = require('underscore'); var path = require('path'); var Promise = require('bluebird'); var _ = require('underscore'); -var fs = Promise.promisifyAll(require('fs')); +var fs = require('fs'); var util = require('./Util'); var Boot2Docker = { + command: function () { + return path.join(process.cwd(), 'resources', 'boot2docker-' + this.version()); + }, version: function () { - return JSON.parse(fs.readFileSync(path.join(__dirname, '..', 'package.json'), 'utf8'))['boot2docker-version']; + try { + return JSON.parse(fs.readFileSync(path.join(__dirname, '..', 'package.json'), 'utf8'))['boot2docker-version']; + } catch (err) { + return null; + } }, cliversion: function () { return util.exec([Boot2Docker.command(), 'version']).then(stdout => { @@ -21,17 +29,17 @@ var Boot2Docker = { }); }, isoversion: function () { - return fs.readFileAsync(path.join(util.home(), '.boot2docker', 'boot2docker.iso'), 'utf8').then(data => { + try { + var data = fs.readFileSync(path.join(util.home(), '.boot2docker', 'boot2docker.iso'), 'utf8'); var match = data.match(/Boot2Docker-v(\d+\.\d+\.\d+)/); if (match) { - return Promise.resolve(match[1]); + return match[1]; } else { - return Promise.resolve(null); + return null; } - }); - }, - command: function () { - return path.join(process.cwd(), 'resources', 'boot2docker-' + this.version()); + } catch (err) { + return null; + } }, exists: function () { return util.exec([Boot2Docker.command(), 'status']).then(() => { @@ -92,11 +100,11 @@ var Boot2Docker = { var usedGb = parseInt(tokens[2], 10) / 1000000; var totalGb = parseInt(tokens[3], 10) / 1000000; var percent = parseInt(tokens[4].replace('%', ''), 10); - Promise.resolve({ + return { used_gb: usedGb.toFixed(2), total_gb: totalGb.toFixed(2), percent: percent - }); + }; } catch (err) { return Promise.reject(err); } @@ -117,12 +125,12 @@ var Boot2Docker = { var freeGb = parseInt(tokens[3], 10) / 1000; var totalGb = usedGb + freeGb; var percent = Math.round(usedGb / totalGb * 100); - return Promise.resolve({ + return { used_gb: usedGb.toFixed(2), total_gb: totalGb.toFixed(2), free_gb: freeGb.toFixed(2), percent: percent - }); + }; } catch (err) { return Promise.reject(err); } diff --git a/src/ContainerDetails.react.js b/src/ContainerDetails.react.js index a65318849f..e8beede01b 100644 --- a/src/ContainerDetails.react.js +++ b/src/ContainerDetails.react.js @@ -4,33 +4,36 @@ var React = require('react/addons'); var Router = require('react-router'); var exec = require('exec'); var path = require('path'); -var assign = require('object-assign'); var remote = require('remote'); var rimraf = require('rimraf'); var fs = require('fs'); var dialog = remote.require('dialog'); var ContainerStore = require('./ContainerStore'); var ContainerUtil = require('./ContainerUtil'); -var docker = require('./Docker'); var boot2docker = require('./Boot2Docker'); -var ProgressBar = require('react-bootstrap/ProgressBar'); -var Popover = require('react-bootstrap/Popover'); +var ContainerDetailsHeader = require('./ContainerDetailsHeader.react'); +var ContainerHome = require('./ContainerHome.react'); +var RetinaImage = require('react-retina-image'); +var Radial = require('./Radial.react'); + +var _oldHeight = 0; var ContainerDetails = React.createClass({ mixins: [Router.State, Router.Navigation], - _oldHeight: 0, + PAGE_HOME: 'home', PAGE_LOGS: 'logs', PAGE_SETTINGS: 'settings', + PAGE_PORTS: 'ports', + PAGE_VOLUMES: 'volumes', getInitialState: function () { return { logs: [], - page: this.PAGE_LOGS, + page: this.PAGE_HOME, env: {}, pendingEnv: {}, ports: {}, - defaultPort: null, - popoverVolumeOpen: false, - popoverViewOpen: false, + volumes: {}, + defaultPort: null }; }, componentWillReceiveProps: function () { @@ -40,22 +43,6 @@ var ContainerDetails = React.createClass({ this.init(); ContainerStore.on(ContainerStore.SERVER_PROGRESS_EVENT, this.updateProgress); ContainerStore.on(ContainerStore.SERVER_LOGS_EVENT, this.updateLogs); - - // Make clicking anywhere close popovers - $('body').on('click', function (e) { - var popoverViewIsTarget = $('.popover-view').is(e.target) || $('.popover-view').has(e.target).length !== 0 || $('.dropdown-view').is(e.target) || $('.dropdown-view').has(e.target).length !== 0; - var popoverVolumeIsTarget = $('.popover-volume').is(e.target) || $('.popover-volume').has(e.target).length !== 0 || $('.dropdown-volume').is(e.target) || $('.dropdown-volume').has(e.target).length !== 0; - var state = {}; - if (!popoverViewIsTarget) { - state.popoverViewOpen = false; - } - if (!popoverVolumeIsTarget) { - state.popoverVolumeOpen = false; - } - if (this.state.popoverViewOpen || this.state.popoverVolumeOpen) { - this.setState(state); - } - }.bind(this)); }, componentWillUnmount: function () { ContainerStore.removeListener(ContainerStore.SERVER_PROGRESS_EVENT, this.updateProgress); @@ -65,29 +52,11 @@ var ContainerDetails = React.createClass({ // Scroll logs to bottom var parent = $('.details-logs'); if (parent.length) { - if (parent.scrollTop() >= this._oldHeight) { + if (parent.scrollTop() >= _oldHeight) { parent.stop(); parent.scrollTop(parent[0].scrollHeight - parent.height()); } - this._oldHeight = parent[0].scrollHeight - parent.height(); - } - - var $viewDropdown = $(this.getDOMNode()).find('.dropdown-view > .icon-dropdown'); - var $volumeDropdown = $(this.getDOMNode()).find('.dropdown-volume'); - var $viewPopover = $(this.getDOMNode()).find('.popover-view'); - var $volumePopover = $(this.getDOMNode()).find('.popover-volume'); - - if ($viewDropdown.offset()) { - $viewPopover.offset({ - top: $viewDropdown.offset().top + 27, - left: $viewDropdown.offset().left - ($viewPopover.outerWidth() / 2) + 5 - }); - } - if ($volumeDropdown.offset()) { - $volumePopover.offset({ - top: $volumeDropdown.offset().top + 33, - left: $volumeDropdown.offset().left + $volumeDropdown.outerWidth() - $volumePopover.outerWidth() / 2 - 20 - }); + _oldHeight = parent[0].scrollHeight - parent.height(); } }, init: function () { @@ -98,7 +67,7 @@ var ContainerDetails = React.createClass({ this.setState({ progress: ContainerStore.progress(this.getParams().name), env: ContainerUtil.env(container), - page: this.PAGE_LOGS + page: this.PAGE_HOME }); var ports = ContainerUtil.ports(container); var webPorts = ['80', '8000', '8080', '3000', '5000', '2368']; @@ -125,17 +94,35 @@ var ContainerDetails = React.createClass({ }); } }, + showHome: function () { + this.setState({ + page: this.PAGE_HOME + }); + }, showLogs: function () { this.setState({ page: this.PAGE_LOGS }); }, + showPorts: function () { + this.setState({ + page: this.PAGE_PORTS + }); + }, + showVolumes: function () { + this.setState({ + page: this.PAGE_VOLUMES + }); + }, showSettings: function () { this.setState({ page: this.PAGE_SETTINGS }); }, handleView: function () { + console.log('CLICKED'); + console.log(this.state.ports); + console.log(this.state.defaultPort); if (this.state.defaultPort) { exec(['open', this.state.ports[this.state.defaultPort].url], function (err) { if (err) { throw err; } @@ -158,19 +145,6 @@ var ContainerDetails = React.createClass({ }); } }, - handleViewDropdown: function(e) { - this.setState({ - popoverViewOpen: !this.state.popoverViewOpen - }); - }, - handleVolumeDropdown: function(e) { - var self = this; - if (_.keys(this.props.container.Volumes).length) { - exec(['open', path.join(process.env.HOME, 'Kitematic', self.props.container.Name)], function (err) { - if (err) { throw err; } - }); - } - }, handleChooseVolumeClick: function (dockerVol) { var self = this; dialog.showOpenDialog({properties: ['openDirectory', 'createDirectory']}, function (filenames) { @@ -187,7 +161,7 @@ var ContainerDetails = React.createClass({ ContainerStore.updateContainer(self.props.container.Name, { Binds: binds }, function (err) { - if (err) console.log(err); + if (err) { console.log(err); } }); } }); @@ -215,10 +189,10 @@ var ContainerDetails = React.createClass({ }); }, handleSaveContainerName: function () { + var newName = $('#input-container-name').val(); if (newName === this.props.container.Name) { return; } - var newName = $('#input-container-name').val(); if (fs.existsSync(path.join(process.env.HOME, 'Kitematic', this.props.container.Name))) { fs.renameSync(path.join(process.env.HOME, 'Kitematic', this.props.container.Name), path.join(process.env.HOME, 'Kitematic', newName)); } @@ -298,6 +272,30 @@ var ContainerDetails = React.createClass({ } }.bind(this)); }, + handleItemMouseEnterRun: function () { + var $action = $(this.getDOMNode()).find('.action .run'); + $action.css("visibility", "visible"); + }, + handleItemMouseLeaveRun: function () { + var $action = $(this.getDOMNode()).find('.action .run'); + $action.css("visibility", "hidden"); + }, + handleItemMouseEnterRestart: function () { + var $action = $(this.getDOMNode()).find('.action .restart'); + $action.css("visibility", "visible"); + }, + handleItemMouseLeaveRestart: function () { + var $action = $(this.getDOMNode()).find('.action .restart'); + $action.css("visibility", "hidden"); + }, + handleItemMouseEnterTerminal: function () { + var $action = $(this.getDOMNode()).find('.action .terminal'); + $action.css("visibility", "visible"); + }, + handleItemMouseLeaveTerminal: function () { + var $action = $(this.getDOMNode()).find('.action .terminal'); + $action.css("visibility", "hidden"); + }, render: function () { var self = this; @@ -313,17 +311,6 @@ var ContainerDetails = React.createClass({ return false; } - var state; - if (this.props.container.State.Running) { - state =

running

; - } else if (this.props.container.State.Restarting) { - state =

restarting

; - } else if (this.props.container.State.Paused) { - state =

paused

; - } else if (this.props.container.State.Downloading) { - state =

downloading

; - } - var button; if (this.state.progress === 1) { button = View; @@ -355,7 +342,7 @@ var ContainerDetails = React.createClass({ disabledClass = 'disabled'; } - var buttonClass = React.addons.classSet({ + /*var buttonClass = React.addons.classSet({ btn: true, 'btn-action': true, 'with-icon': true, @@ -401,56 +388,92 @@ var ContainerDetails = React.createClass({ 'only-icon': true, 'active': this.state.page === this.PAGE_SETTINGS, disabled: this.props.container.State.Downloading + });*/ + + var ports = _.map(_.pairs(self.state.ports), function (pair) { + var key = pair[0]; + var val = pair[1]; + return ( +
+ {key} + {val.display} +
+ ); }); - var viewPopoverClasses = React.addons.classSet({ - popover: true, - hidden: false + var volumes = _.map(self.props.container.Volumes, function (val, key) { + if (!val || val.indexOf(process.env.HOME) === -1) { + val = 'No Host Folder'; + } + return ( +
+ {key} + {val.replace(process.env.HOME, '~')} +
+ ); }); - var popoverVolumeClasses = React.addons.classSet({ - 'popover-volume': true, - hidden: !this.state.popoverVolumeOpen - }); - - var popoverViewClasses = React.addons.classSet({ - 'popover-view': true, - hidden: !this.state.popoverViewOpen - }); - - var dropdownClasses = { - btn: true, - 'btn-action': true, - 'with-icon': true, - 'dropdown-toggle': true, - disabled: !this.props.container.State.Running - }; - var dropdownViewButtonClass = React.addons.classSet(assign({'dropdown-view': true}, dropdownClasses)); - var body; if (this.props.container.State.Downloading) { if (this.state.progress) { body = (
-

Downloading

- +

Downloading Image

+
); } else { - + body = ( +
+

Connecting to Docker Hub

+ +
+ ); } } else { - if (this.state.page === this.PAGE_LOGS) { + if (this.state.page === this.PAGE_HOME) { body = ( -
-
- {logs} + + ); + } else if (this.state.page === this.PAGE_LOGS) { + body = ( +
+ {logs} +
+ ); + } else if (this.state.page === this.PAGE_PORTS) { + body = ( +
+
+

Configure Ports

+
+
+
DOCKER PORT
+
MAC PORT
+
+ {ports} +
+
+
+ ); + } else if (this.state.page === this.PAGE_VOLUMES) { + body = ( +
+
+

Configure Volumes

+
+
+
DOCKER FOLDER
+
MAC FOLDER
+
+ {volumes} +
); } else { var rename = ( -
+

Container Name

@@ -462,30 +485,52 @@ var ContainerDetails = React.createClass({
{rename} -

Environment Variables

-
-
KEY
-
VALUE
-
-
- {envVars} - {pendingEnvVars} -
- - - +
+

Environment Variables

+
+
KEY
+
VALUE
+
+ {envVars} + {pendingEnvVars} +
+ + + +
+
+ Save +
+
+

Delete Container

+ Delete Container
- Save -

Delete Container

- Delete Container
); } } - var ports = _.map(_.pairs(self.state.ports), function (pair, index, list) { + var tabHomeClasses = React.addons.classSet({ + 'tab': true, + 'active': this.state.page === this.PAGE_HOME, + disabled: this.props.container.State.Downloading + }); + + var tabLogsClasses = React.addons.classSet({ + 'tab': true, + 'active': this.state.page === this.PAGE_LOGS, + disabled: this.props.container.State.Downloading + }); + + var tabSettingsClasses = React.addons.classSet({ + 'tab': true, + 'active': this.state.page === this.PAGE_SETTINGS, + disabled: this.props.container.State.Downloading + }); + + /*var ports = _.map(_.pairs(self.state.ports), function (pair, index, list) { var key = pair[0]; var val = pair[1]; return ( @@ -509,9 +554,9 @@ var ContainerDetails = React.createClass({ {val}
); - }); + });*/ - var view; + /* var view; if (this.state.defaultPort) { view = (
@@ -525,48 +570,31 @@ var ContainerDetails = React.createClass({ Ports
); - } + }*/ return (
-
-
-

{this.props.container.Name}

{state}

Image

{this.props.container.Config.Image}

-
+ +
- {view} -
- Volumes +
+ + Run
-
- Restart +
+ + Restart
- -
- - +
+ + Terminal
- -
-
-
DOCKER PORT
-
MAC PORT
-
- {ports} -
- - -
-
-
DOCKER VOLUME
-
MAC FOLDER
-
- {volumes} -
- +
+ Home + Logs + Settings +
{body}
diff --git a/src/ContainerDetailsHeader.react.js b/src/ContainerDetailsHeader.react.js new file mode 100644 index 0000000000..187d943840 --- /dev/null +++ b/src/ContainerDetailsHeader.react.js @@ -0,0 +1,25 @@ +var React = require('react/addons'); + +var ContainerDetailsHeader = React.createClass({ + render: function () { + var state; + if (this.props.container.State.Running) { + state = RUNNING; + } else if (this.props.container.State.Restarting) { + state = RESTARTING; + } else if (this.props.container.State.Paused) { + state = PAUSED; + } else if (this.props.container.State.Downloading) { + state = DOWNLOADING; + } else { + state = STOPPED; + } + return ( +
+

{this.props.container.Name}

{state} +
+ ); + } +}); + +module.exports = ContainerDetailsHeader; diff --git a/src/ContainerHome.react.js b/src/ContainerHome.react.js new file mode 100644 index 0000000000..72eae2ec0d --- /dev/null +++ b/src/ContainerHome.react.js @@ -0,0 +1,106 @@ +var _ = require('underscore'); +var $ = require('jquery'); +var React = require('react/addons'); +var RetinaImage = require('react-retina-image'); +var path = require('path'); +var exec = require('exec'); + +var ContainerHome = React.createClass({ + handleResize: function () { + $('.web-preview').height(window.innerHeight - 240); + $('.mini-logs').height(window.innerHeight / 2 - 100); + $('.folders').height(window.innerHeight / 2 - 150); + }, + componentDidMount: function() { + $('.web-preview').height(window.innerHeight - 240); + $('.mini-logs').height(window.innerHeight / 2 - 100); + $('.folders').height(window.innerHeight / 2 - 150); + window.addEventListener('resize', this.handleResize); + }, + componentWillUnmount: function() { + window.removeEventListener('resize', this.handleResize); + }, + componentDidUpdate: function () { + // Scroll logs to bottom + $('.web-preview').height(window.innerHeight - 240); + $('.mini-logs').height(window.innerHeight / 2 - 100); + $('.folders').height(window.innerHeight / 2 - 150); + var parent = $('.mini-logs'); + if (parent.length) { + if (parent.scrollTop() >= this._oldHeight) { + parent.stop(); + parent.scrollTop(parent[0].scrollHeight - parent.height()); + } + this._oldHeight = parent[0].scrollHeight - parent.height(); + } + }, + handleClickFolder: function (path) { + exec(['open', path], function (err) { + if (err) { throw err; } + }); + }, + handleClickPreview: function () { + if (this.props.defaultPort) { + exec(['open', this.props.ports[this.props.defaultPort].url], function (err) { + if (err) { throw err; } + }); + } + }, + render: function () { + var preview; + if (this.props.defaultPort) { + preview = ( +
+

Web Preview

+
+ +
Open in Browser
+
+
Not showing correctly?
+
+ ); + } + console.log(this.props.container.Volumes); + var self = this; + var folders = _.map(self.props.container.Volumes, function (val, key) { + var firstFolder = key.split(path.sep)[1]; + if (!val || val.indexOf(process.env.HOME) === -1) { + return; + } else { + return ( +
+ +
{firstFolder}
+
+ ); + } + }); + return ( +
+
+
+ {preview} +
+
+
+

Logs

+
+ {this.props.logs} +
View Logs
+
+
+
+

Edit Files

+
+ {folders} +
+
Change Folders
+
+
+
+
+ ); + } +}); + +module.exports = ContainerHome; diff --git a/src/ContainerList.react.js b/src/ContainerList.react.js index 2e65a6ddd5..082bef2699 100644 --- a/src/ContainerList.react.js +++ b/src/ContainerList.react.js @@ -1,14 +1,6 @@ -var async = require('async'); -var _ = require('underscore'); -var $ = require('jquery'); var React = require('react/addons'); -var Router = require('react-router'); -var Modal = require('react-bootstrap/Modal'); -var RetinaImage = require('react-retina-image'); -var ModalTrigger = require('react-bootstrap/ModalTrigger'); -var ContainerModal = require('./ContainerModal.react'); -var Header = require('./Header.react'); -var docker = require('./Docker'); +var ContainerListItem = require('./ContainerListItem.react'); +var ContainerListNewItem = require('./ContainerListNewItem.react'); var ContainerList = React.createClass({ componentWillMount: function () { @@ -17,59 +9,13 @@ var ContainerList = React.createClass({ render: function () { var self = this; var containers = this.props.containers.map(function (container) { - var downloadingImage = null, downloading = false; - var env = container.Config.Env; - if (env.length) { - var obj = _.object(env.map(function (e) { - return e.split('='); - })); - if (obj.KITEMATIC_DOWNLOADING) { - downloading = true; - } - downloadingImage = obj.KITEMATIC_DOWNLOADING_IMAGE || null; - } - - var imageName = downloadingImage || container.Config.Image; - - // Synchronize all animations - var style = { - WebkitAnimationDelay: (self._start - Date.now()) + 'ms' - }; - - var state; - if (downloading) { - state =
; - } else if (container.State.Running && !container.State.Paused) { - state =
; - } else if (container.State.Restarting) { - state =
; - } else if (container.State.Paused) { - state =
; - } else if (container.State.ExitCode) { - // state =
; - state =
; - } else { - state =
; - } - return ( - -
  • - {state} -
    -
    - {container.Name} -
    -
    - {imageName} -
    -
    -
    • -     + ); }); return (
      + {containers}
    ); diff --git a/src/ContainerListItem.react.js b/src/ContainerListItem.react.js new file mode 100644 index 0000000000..175def45c8 --- /dev/null +++ b/src/ContainerListItem.react.js @@ -0,0 +1,89 @@ +var _ = require('underscore'); +var $ = require('jquery'); +var React = require('react/addons'); +var Router = require('react-router'); +var remote = require('remote'); +var dialog = remote.require('dialog'); +var ContainerStore = require('./ContainerStore'); + +var ContainerListItem = React.createClass({ + handleItemMouseEnter: function () { + var $action = $(this.getDOMNode()).find('.action'); + $action.show(); + }, + handleItemMouseLeave: function () { + var $action = $(this.getDOMNode()).find('.action'); + $action.hide(); + }, + handleDeleteContainer: function () { + dialog.showMessageBox({ + message: 'Are you sure you want to delete this container?', + buttons: ['Delete', 'Cancel'] + }, function (index) { + if (index === 0) { + ContainerStore.remove(this.props.container.Name, function (err) { + console.error(err); + }); + } + }.bind(this)); + }, + render: function () { + var self = this; + var container = this.props.container; + var downloadingImage = null, downloading = false; + var env = container.Config.Env; + if (env.length) { + var obj = _.object(env.map(function (e) { + return e.split('='); + })); + if (obj.KITEMATIC_DOWNLOADING) { + downloading = true; + } + downloadingImage = obj.KITEMATIC_DOWNLOADING_IMAGE || null; + } + + var imageName = downloadingImage || container.Config.Image; + + // Synchronize all animations + var style = { + WebkitAnimationDelay: (self.props.start - Date.now()) + 'ms' + }; + + var state; + if (downloading) { + state =
    ; + } else if (container.State.Running && !container.State.Paused) { + state =
    ; + } else if (container.State.Restarting) { + state =
    ; + } else if (container.State.Paused) { + state =
    ; + } else if (container.State.ExitCode) { + // state =
    ; + state =
    ; + } else { + state =
    ; + } + + return ( + +
  • + {state} +
    +
    + {container.Name} +
    +
    + {imageName} +
    +
    +
    + +
    +
    • +     + ); + } +}); + +module.exports = ContainerListItem; diff --git a/src/ContainerListNewItem.react.js b/src/ContainerListNewItem.react.js new file mode 100644 index 0000000000..3260aceb2f --- /dev/null +++ b/src/ContainerListNewItem.react.js @@ -0,0 +1,43 @@ +var $ = require('jquery'); +var React = require('react/addons'); +var Router = require('react-router'); + +var ContainerListNewItem = React.createClass({ + handleItemMouseEnter: function () { + var $action = $(this.getDOMNode()).find('.action'); + $action.show(); + }, + handleItemMouseLeave: function () { + var $action = $(this.getDOMNode()).find('.action'); + $action.hide(); + }, + handleDelete: function () { + $(this.getDOMNode()).fadeOut(); + }, + render: function () { + var self = this; + var action; + if (this.props.containers.length > 0) { + action = ( +
    + +
    + ); + } + return ( + +
  • +
    +
    +
    + New Container +
    +
    + {action} +
    • +     + ); + } +}); + +module.exports = ContainerListNewItem; diff --git a/src/ContainerModal.react.js b/src/ContainerModal.react.js index e2d8d8ebc5..a78ef0edd0 100644 --- a/src/ContainerModal.react.js +++ b/src/ContainerModal.react.js @@ -1,13 +1,9 @@ -var async = require('async'); var $ = require('jquery'); var assign = require('object-assign'); var React = require('react/addons'); var Modal = require('react-bootstrap').Modal; var OverlayTrigger = require('react-bootstrap'); var Popover = require('react-bootstrap/Popover'); -var SplitButton = require('react-bootstrap/SplitButton'); -var MenuItem = require('react-bootstrap/MenuItem'); - var RetinaImage = require('react-retina-image'); var ContainerStore = require('./ContainerStore'); var OverlayTrigger = require('react-bootstrap/OverlayTrigger'); @@ -81,19 +77,19 @@ var ContainerModal = React.createClass({ }, 200); } }, - handleClick: function (name, event) { + handleClick: function (name) { this.props.onRequestHide(); - ContainerStore.create(name, 'latest', function (err, containerName) { + ContainerStore.create(name, 'latest', function (err) { if (err) { throw err; } }.bind(this)); }, - handleTagClick: function (tag, name, event) { + handleTagClick: function (tag, name) { this.props.onRequestHide(); - ContainerStore.create(name, tag, function (err, containerName) {}); + ContainerStore.create(name, tag, function () {}); }, - handleDropdownClick: function (name, event) { + handleDropdownClick: function (name) { this.setState({ active: name }); diff --git a/src/ContainerStore.js b/src/ContainerStore.js index 74b50a7ef2..865ab765c6 100644 --- a/src/ContainerStore.js +++ b/src/ContainerStore.js @@ -4,14 +4,12 @@ var EventEmitter = require('events').EventEmitter; var async = require('async'); var path = require('path'); var assign = require('object-assign'); -var Stream = require('stream'); var Convert = require('ansi-to-html'); var docker = require('./Docker'); var registry = require('./Registry'); var ContainerUtil = require('./ContainerUtil'); var convert = new Convert(); - var _recommended = []; var _containers = {}; var _progress = {}; @@ -35,7 +33,7 @@ var ContainerStore = assign(EventEmitter.prototype, { return; } stream.setEncoding('utf8'); - stream.on('data', function (data) {}); + stream.on('data', function () {}); stream.on('end', function () { callback(); }); @@ -120,11 +118,11 @@ var ContainerStore = assign(EventEmitter.prototype, { if (containerData.Config && containerData.Config.Image) { containerData.Image = containerData.Config.Image; } - existing.kill(function (err, data) { + existing.kill(function (err) { if (err) { console.log(err); } - existing.remove(function (err, data) { + existing.remove(function (err) { if (err) { console.log(err); } @@ -179,7 +177,7 @@ var ContainerStore = assign(EventEmitter.prototype, { ], Cmd: 'placeholder', name: name - }, function (err, container) { + }, function (err) { if (err) { callback(err); return; @@ -212,7 +210,7 @@ var ContainerStore = assign(EventEmitter.prototype, { downloading.forEach(function (container) { docker.client().pull(container.KitematicDownloadingImage, function (err, stream) { stream.setEncoding('utf8'); - stream.on('data', function (data) {}); + stream.on('data', function () {}); stream.on('end', function () { self._createContainer(container.Name, {Image: container.KitematicDownloadingImage}, function () {}); }); @@ -268,7 +266,7 @@ var ContainerStore = assign(EventEmitter.prototype, { this._resumePulling(); this._startListeningToEvents(); }.bind(this)); - this.fetchRecommended(function (err) { + this.fetchRecommended(function () { this.emit(this.CLIENT_RECOMMENDED_EVENT); }.bind(this)); }, @@ -289,7 +287,7 @@ var ContainerStore = assign(EventEmitter.prototype, { container.State.Downloading = !!env.KITEMATIC_DOWNLOADING; container.KitematicDownloadingImage = env.KITEMATIC_DOWNLOADING_IMAGE; - this.fetchLogs(container.Name, function (err) { + this.fetchLogs(container.Name, function () { }.bind(this)); _containers[container.Name] = container; @@ -308,7 +306,7 @@ var ContainerStore = assign(EventEmitter.prototype, { self.fetchContainer(container.Id, function (err) { callback(err); }); - }, function (err, results) { + }, function (err) { callback(err); }); }); @@ -317,20 +315,19 @@ var ContainerStore = assign(EventEmitter.prototype, { if (_recommended.length) { return; } - var self = this; $.ajax({ url: 'https://kitematic.com/recommended.json', cache: false, dataType: 'json', - success: function (res, status) { - var recommended = res.recommended; - async.map(recommended, function (repository, callback) { - $.get('https://registry.hub.docker.com/v1/search?q=' + repository, function (data) { - console.log(data); + success: function (res) { + var recommended = res.repos; + async.map(recommended, function (rec, callback) { + $.get('https://registry.hub.docker.com/v1/search?q=' + rec.repo, function (data) { var results = data.results; - callback(null, _.find(results, function (r) { - return r.name === repository; - })); + var result = _.find(results, function (r) { + return r.name === rec.repo; + }); + callback(null, _.extend(result, rec)); }); }, function (err, results) { _recommended = results.filter(function(r) { return !!r; }); @@ -365,7 +362,7 @@ var ContainerStore = assign(EventEmitter.prototype, { stream.on('data', function (buf) { // Every other message is a header if (index % 2 === 1) { - var time = buf.substr(0,buf.indexOf(' ')); + //var time = buf.substr(0,buf.indexOf(' ')); var msg = buf.substr(buf.indexOf(' ')+1); if (timeout) { clearTimeout(timeout); @@ -389,7 +386,6 @@ var ContainerStore = assign(EventEmitter.prototype, { var self = this; var imageName = repository + ':' + tag; var containerName = this._generateName(repository); - var image = docker.client().getImage(imageName); // Pull image self._createPlaceholderContainer(imageName, containerName, function (err, container) { if (err) { @@ -401,7 +397,7 @@ var ContainerStore = assign(EventEmitter.prototype, { _muted[containerName] = true; _progress[containerName] = 0; self._pullImage(repository, tag, function () { - self._createContainer(containerName, {Image: imageName}, function (err, container) { + self._createContainer(containerName, {Image: imageName}, function () { delete _progress[containerName]; _muted[containerName] = false; self.emit(self.CLIENT_CONTAINER_EVENT, containerName); @@ -432,7 +428,6 @@ var ContainerStore = assign(EventEmitter.prototype, { }); }, remove: function (name, callback) { - var self = this; var container = docker.client().getContainer(name); if (_containers[name].State.Paused) { container.unpause(function (err) { diff --git a/src/ContainerUtil.js b/src/ContainerUtil.js index 61159f7186..8ff36e6620 100644 --- a/src/ContainerUtil.js +++ b/src/ContainerUtil.js @@ -12,7 +12,7 @@ var ContainerUtil = { return splits; })); }, - ports: function (container, callback) { + ports: function (container) { var res = {}; var ip = docker.host; _.each(container.NetworkSettings.Ports, function (value, key) { diff --git a/src/Containers.react.js b/src/Containers.react.js index 8c527d978d..0446677df6 100644 --- a/src/Containers.react.js +++ b/src/Containers.react.js @@ -1,22 +1,17 @@ -var async = require('async'); -var _ = require('underscore'); var $ = require('jquery'); var React = require('react/addons'); var Router = require('react-router'); -var RetinaImage = require('react-retina-image'); -var ModalTrigger = require('react-bootstrap/ModalTrigger'); -var ContainerModal = require('./ContainerModal.react'); var ContainerStore = require('./ContainerStore'); var ContainerList = require('./ContainerList.react'); var Header = require('./Header.react'); -var docker = require('./Docker'); + var Containers = React.createClass({ mixins: [Router.Navigation, Router.State], getInitialState: function () { return { sidebarOffset: 0, containers: ContainerStore.containers(), - sorted: ContainerStore.sorted(), + sorted: ContainerStore.sorted() }; }, componentDidMount: function () { @@ -65,6 +60,10 @@ var Containers = React.createClass({ }); } }, + handleNewContainer: function () { + $(this.getDOMNode()).find('.new-container-item').parent().fadeIn(); + this.transitionTo('new'); + }, render: function () { var sidebarHeaderClass = 'sidebar-header'; if (this.state.sidebarOffset) { @@ -74,19 +73,17 @@ var Containers = React.createClass({ var container = this.getParams().name ? this.state.containers[this.getParams().name] : {}; return (
    -
    +
    -

    My Containers

    +

    Containers

    - }> - - +
    - +
    diff --git a/src/Header.react.js b/src/Header.react.js index e12d1199f4..69b20baf08 100644 --- a/src/Header.react.js +++ b/src/Header.react.js @@ -1,5 +1,6 @@ var React = require('react/addons'); var remote = require('remote'); +var RetinaImage = require('react-retina-image'); var Header = React.createClass({ getInitialState: function () { @@ -35,25 +36,26 @@ var Header = React.createClass({ this.update(); }, render: function () { - var buttons; if (this.state.fullscreen) { return (
    -
    -
    -
    +
    +
    +
    +
    ); } else { return (
    -
    -
    -
    +
    +
    +
    +
    ); } diff --git a/src/Main.js b/src/Main.js index 86644ab120..0ea0c28750 100644 --- a/src/Main.js +++ b/src/Main.js @@ -1,3 +1,4 @@ +require.main.paths.splice(0, 0, process.env.NODE_PATH); var remote = require('remote'); var app = remote.require('app'); var React = require('react'); diff --git a/src/Menu.js b/src/Menu.js index 336209f99f..7f1a85569e 100644 --- a/src/Menu.js +++ b/src/Menu.js @@ -1,7 +1,6 @@ var remote = require('remote'); var app = remote.require('app'); var Menu = remote.require('menu'); -var MenuItem = remote.require('menu-item'); var BrowserWindow = remote.require('browser-window'); var router = require('./Router'); @@ -136,7 +135,7 @@ var template = [ }, ]; -menu = Menu.buildFromTemplate(template); +var menu = Menu.buildFromTemplate(template); Menu.setApplicationMenu(menu); module.exports = menu; diff --git a/src/NewContainer.react.js b/src/NewContainer.react.js new file mode 100644 index 0000000000..b8e132dfce --- /dev/null +++ b/src/NewContainer.react.js @@ -0,0 +1,217 @@ +var _ = require('underscore'); +var $ = require('jquery'); +var React = require('react/addons'); +var RetinaImage = require('react-retina-image'); +var ContainerStore = require('./ContainerStore'); +var Radial = require('./Radial.react'); +var assign = require('object-assign'); + +var NewContainer = React.createClass({ + _searchRequest: null, + getInitialState: function () { + return { + query: '', + results: ContainerStore.recommended(), + loading: false, + tags: {}, + active: null, + creating: [] + }; + }, + componentDidMount: function () { + this.setState({ + creating: [] + }); + this.refs.searchInput.getDOMNode().focus(); + ContainerStore.on(ContainerStore.CLIENT_RECOMMENDED_EVENT, this.update); + }, + update: function () { + if (!this.state.query.length) { + this.setState({ + results: ContainerStore.recommended() + }); + } + }, + search: function (query) { + if (this._searchRequest) { + this._searchRequest.abort(); + this._searchRequest = null; + } + + if (!query.length) { + return; + } + + this.setState({ + loading: true + }); + + var self = this; + this._searchRequest = $.get('https://registry.hub.docker.com/v1/search?q=' + query, function (result) { + self.setState({ + query: query, + loading: false + }); + self._searchRequest = null; + if (self.isMounted()) { + self.setState(result); + } + }); + }, + handleChange: function (e) { + var query = e.target.value; + + if (query === this.state.query) { + return; + } + + clearTimeout(this.timeout); + if (!query.length) { + this.setState({ + query: query, + results: ContainerStore.recommended() + }); + } else { + var self = this; + this.timeout = setTimeout(function () { + self.search(query); + }, 200); + } + }, + handleClick: function (name) { + ContainerStore.create(name, 'latest', function (err) { + if (err) { + throw err; + } + $(document.body).find('.new-container-item').parent().fadeOut(); + }.bind(this)); + }, + handleDropdownClick: function (name) { + this.setState({ + active: name + }); + if (this.state.tags[name]) { + return; + } + $.get('https://registry.hub.docker.com/v1/repositories/' + name + '/tags', function (result) { + var res = {}; + res[name] = result; + console.log(assign(this.state.tags, res)); + this.setState({ + tags: assign(this.state.tags, res) + }); + }.bind(this)); + }, + render: function () { + var self = this; + var title = this.state.query ? 'Results' : 'Recommended'; + var data = this.state.results.slice(0, 6); + + var results; + if (data.length) { + var items = data.map(function (r) { + var name; + if (r.is_official) { + name = {r.name}; + } else { + name = {r.name}; + } + var description; + if (r.description) { + description = r.description; + } else { + description = "No description."; + } + var logoStyle = { + backgroundImage: `linear-gradient(-180deg, ${r.gradient_start} 4%, ${r.gradient_end} 100%)` + }; + var imgsrc; + if (r.img) { + imgsrc = `http://kitematic.com/recommended/${r.img}`; + } else { + imgsrc = 'http://kitematic.com/recommended/kitematic_html.png'; + } + var action; + if (_.find(self.state.creating, r.name)) { + action = ; + } else { + action = Create; + } + return ( +
    +
    + +
    +
    +
    + {name} +
    +
    + {description} +
    +
    +
    + + {r.star_count} +
    +
    + + latest +
    +
    + {action} +
    +
    +
    +
    + ); + }); + + results = ( +
    + {items} +
    + ); + } else { + results = ( +
    + +
    + ); + } + var loadingClasses = React.addons.classSet({ + hidden: !this.state.loading, + loading: true + }); + var magnifierClasses = React.addons.classSet({ + hidden: this.state.loading, + icon: true, + 'icon-magnifier': true, + 'search-icon': true + }); + return ( +
    +
    +
    +
    + Pick an image to create new container. +
    +
    +
    + +
    + +
    +
    +
    +
    +

    {title}

    + {results} +
    +
    +
    + ); + } +}); + +module.exports = NewContainer; diff --git a/src/NoContainers.react.js b/src/NoContainers.react.js index 4d15223be6..2be1c9d0eb 100644 --- a/src/NoContainers.react.js +++ b/src/NoContainers.react.js @@ -1,5 +1,4 @@ var React = require('react/addons'); -var RetinaImage = require('react-retina-image'); var NoContainers = React.createClass({ render: function () { diff --git a/src/Preferences.react.js b/src/Preferences.react.js index c18ddc782c..233ab721a1 100644 --- a/src/Preferences.react.js +++ b/src/Preferences.react.js @@ -15,7 +15,7 @@ var Preferences = React.createClass({ report_analytics: true }, data || {}); }, - handleChange: function (key, e) { + handleChange: function (key) { var change = {}; change[key] = !this.state[key]; console.log(change); diff --git a/src/Registry.js b/src/Registry.js index 2fc0dcf0be..8b4352d9f5 100644 --- a/src/Registry.js +++ b/src/Registry.js @@ -22,7 +22,7 @@ var Registry = { headers: { Authorization: 'Token ' + token }, - success: function (layers, status, xhr) { + success: function (layers) { callback(null, layers); }, error: function (err) { @@ -36,7 +36,7 @@ var Registry = { headers: { Authorization: 'Token ' + token }, - success: function (res, status, xhr) { + success: function (res) { callback(null, res); }, error: function (err) { diff --git a/src/Routes.js b/src/Routes.js index 4641ad29d5..847fb8d1e6 100644 --- a/src/Routes.js +++ b/src/Routes.js @@ -3,7 +3,7 @@ var Setup = require('./Setup.react'); var Containers = require('./Containers.react'); var ContainerDetails = require('./ContainerDetails.react'); var Preferences = require('./Preferences.react'); -var NoContainers = require('./NoContainers.react'); +var NewContainer = require('./NewContainer.react'); var Router = require('react-router'); var Route = Router.Route; @@ -23,7 +23,7 @@ var routes = ( - + diff --git a/src/Setup.react.js b/src/Setup.react.js index 7bb1ddba3b..5860d4a30f 100644 --- a/src/Setup.react.js +++ b/src/Setup.react.js @@ -3,6 +3,7 @@ var Router = require('react-router'); var Radial = require('./Radial.react.js'); var SetupStore = require('./SetupStore'); var RetinaImage = require('react-retina-image'); +var Header = require('./Header.react'); var Setup = React.createClass({ mixins: [ Router.Navigation ], @@ -28,9 +29,10 @@ var Setup = React.createClass({ }); }, renderDownloadingVirtualboxStep: function () { - var message = 'Kitematic needs VirtualBox to run containers. VirtualBox is being downloaded from Oracle\'s website.'; + var message = "VirtualBox is being downloaded from Oracle's servers. Kitematic requires VirtualBox to run."; return (
    +
    @@ -41,6 +43,7 @@ var Setup = React.createClass({
    +

    Step 1 out of 4

    Downloading VirtualBox

    {message}

    @@ -49,9 +52,10 @@ var Setup = React.createClass({ ); }, renderInstallingVirtualboxStep: function () { - var message = 'VirtualBox is being installed. Administrative privileges are required.'; + var message = 'VirtualBox is being installed in the background. We may need you to type in your password to continue.'; return (
    +
    @@ -62,6 +66,7 @@ var Setup = React.createClass({
    +

    Step 2 out of 4

    Installing VirtualBox

    {message}

    @@ -70,9 +75,10 @@ var Setup = React.createClass({ ); }, renderInitBoot2DockerStep: function () { - var message = 'Containers run in a virtual machine provided by Boot2Docker. Kitematic is setting up that Linux VM.'; + var message = 'To run Docker containers on your computer, we are setting up a Linux virtual machine provided by boot2docker.'; return (
    +
    @@ -83,7 +89,8 @@ var Setup = React.createClass({
    -

    Setting up the Docker VM

    +

    Step 3 out of 4

    +

    Setting up Docker VM

    {message}

    @@ -91,9 +98,10 @@ var Setup = React.createClass({ ); }, renderStartBoot2DockerStep: function () { - var message = 'Kitematic is starting the Boot2Docker Linux VM.'; + var message = 'Kitematic is starting the boot2docker VM. This may take about a minute.'; return (
    +
    @@ -104,7 +112,8 @@ var Setup = React.createClass({
    -

    Starting the Docker VM

    +

    Step 4 out of 4

    +

    Starting Docker VM

    {message}

    @@ -132,8 +141,22 @@ var Setup = React.createClass({ if (this.state.error) { return (
    - ; -

    Error: {this.state.error}

    +
    +
    +
    + +
    +
    +
    +
    +
    +
    +

    Installation Error

    +

    We're Sorry!

    +

    There seem to be an unexpected error with Kitematic:

    +

    {this.state.error}

    +
    +
    ); } else { diff --git a/src/SetupStore.js b/src/SetupStore.js index 34a340af65..2f851eb505 100644 --- a/src/SetupStore.js +++ b/src/SetupStore.js @@ -13,8 +13,8 @@ var _percent = 0; var _currentStep = null; var _error = null; -var VIRTUALBOX_FILE = `http://download.virtualbox.org/virtualbox/${packagejson['virtualbox-version']}/${packagejson['virtualbox-filename']}`; -var SUDO_PROMPT = 'Kitematic requires administrative privileges to install VirtualBox and copy itself to the Applications folder.'; +var VIRTUALBOX_FILE = `https://github.com/kitematic/virtualbox/releases/download/${packagejson['virtualbox-version']}/${packagejson['virtualbox-filename']}`; +var SUDO_PROMPT = 'Kitematic requires administrative privileges to install VirtualBox.'; var SetupStore = assign(EventEmitter.prototype, { PROGRESS_EVENT: 'setup_progress', @@ -27,8 +27,7 @@ var SetupStore = assign(EventEmitter.prototype, { return; } } - var checksum = yield setupUtil.virtualboxSHA256(packagejson['virtualbox-version'], packagejson['virtualbox-filename']); - yield setupUtil.download(VIRTUALBOX_FILE, path.join(setupUtil.supportDir(), packagejson['virtualbox-filename']), checksum, percent => { + yield setupUtil.download(VIRTUALBOX_FILE, path.join(setupUtil.supportDir(), packagejson['virtualbox-filename']), packagejson.checksum, percent => { _percent = percent; SetupStore.emit(SetupStore.PROGRESS_EVENT); }); @@ -39,15 +38,13 @@ var SetupStore = assign(EventEmitter.prototype, { if (setupUtil.compareVersions(version, packagejson['virtualbox-required-version']) >= 0) { return; } - yield virtualbox.kill(); + yield virtualbox.killall(); } - yield util.exec(['hdiutil', 'attach', path.join(setupUtil.supportDir(), packagejson['virtualbox-filename'])]); var isSudo = yield setupUtil.isSudo(); var iconPath = path.join(setupUtil.resourceDir(), 'kitematic.icns'); var sudoCmd = isSudo ? ['sudo'] : [path.join(setupUtil.resourceDir(), 'cocoasudo'), '--icon=' + iconPath, `--prompt=${SUDO_PROMPT}`]; - sudoCmd.push.apply(sudoCmd, ['installer', '-pkg', '/Volumes/VirtualBox/VirtualBox.pkg', '-target', '/']); + sudoCmd.push.apply(sudoCmd, ['installer', '-pkg', path.join(setupUtil.supportDir(), packagejson['virtualbox-filename']), '-target', '/']); yield util.exec(sudoCmd); - yield util.exec(['hdiutil', 'detach', '/Volumes/VirtualBox']); }), cleanupKitematicStep: function () { return virtualbox.vmdestroy('kitematic-vm'); @@ -60,10 +57,10 @@ var SetupStore = assign(EventEmitter.prototype, { } if (!boot2docker.haskeys()) { - throw new Error('Boot2Docker SSH key doesn\'t exist. Fix by removing the existing Boot2Docker VM and re-run the installer. This usually occurs because an old version of Boot2Docker is installed.'); + throw new Error('Boot2Docker SSH keys do not exist. Fix this by removing the existing Boot2Docker VM setup and re-run the installer. This usually occurs because an old version of Boot2Docker is installed.'); } - var isoversion = yield boot2docker.isoversion(); + var isoversion = boot2docker.isoversion(); if (!isoversion || setupUtil.compareVersions(isoversion, boot2docker.version()) < 0) { yield boot2docker.stop(); yield boot2docker.upgrade(); @@ -116,6 +113,7 @@ var SetupStore = assign(EventEmitter.prototype, { try { yield step.run(); } catch (err) { + console.log(err); _error = err; this.emit(this.ERROR_EVENT); throw err; diff --git a/src/SetupUtil.js b/src/SetupUtil.js index fa56f8652d..ab4dbe134b 100644 --- a/src/SetupUtil.js +++ b/src/SetupUtil.js @@ -4,7 +4,6 @@ var path = require('path'); var crypto = require('crypto'); var fs = require('fs'); var exec = require('exec'); -var rp = require('request-promise'); var Promise = require('bluebird'); var SetupUtil = { @@ -44,7 +43,9 @@ var SetupUtil = { } progress(request({ uri: url, rejectUnauthorized: false }), { throttle: 250 }).on('progress', state => { - percentCallback(state.percent); + if (percentCallback) { + percentCallback(state.percent); + } }).on('error', err => { reject(err); }).pipe(fs.createWriteStream(filename)).on('error', err => { @@ -57,17 +58,6 @@ var SetupUtil = { }); }); }, - virtualboxSHA256: function (version, filename) { - return rp(`http://dlc-cdn.sun.com/virtualbox/${version}/SHA256SUMS`).then((body) => { - var checksums = body.split('\n').map(line => { - return line.split(' *'); - }).reduce((obj, pair) => { - obj[pair[1]] = pair[0]; - return obj; - }, {}); - return Promise.resolve(checksums[filename]); - }); - }, compareVersions: function (v1, v2, options) { var lexicographical = options && options.lexicographical, zeroExtend = options && options.zeroExtend, diff --git a/src/Virtualbox.js b/src/Virtualbox.js index e665af8cd8..a1d20bb427 100644 --- a/src/Virtualbox.js +++ b/src/Virtualbox.js @@ -7,12 +7,9 @@ var VirtualBox = { return '/usr/bin/VBoxManage'; }, installed: function () { - return fs.existsSync('/usr/bin/VBoxManage') && fs.existsSync('/Applications/VirtualBox.app/Contents/MacOS/VirtualBox'); + return fs.existsSync('/usr/bin/VBoxManage') && fs.existsSync('/Applications/VirtualBox.app'); }, version: function () { - if (!this.installed()) { - return Promise.reject('VirtualBox not installed.'); - } return new Promise((resolve, reject) => { util.exec([this.command(), '-v']).then(stdout => { var match = stdout.match(/(\d+\.\d+\.\d+).*/); @@ -29,7 +26,7 @@ var VirtualBox = { } return util.exec(this.command() + ' list runningvms | sed -E \'s/.*\\{(.*)\\}/\\1/\' | xargs -L1 -I {} ' + this.command() + ' controlvm {} poweroff'); }, - kill: function () { + killall: function () { if (!this.installed()) { return Promise.reject('VirtualBox not installed.'); } @@ -51,16 +48,18 @@ var VirtualBox = { }); }, vmdestroy: function (name) { - if (!this.installed()) { - throw Promise.reject('VirtualBox not installed.'); - } - return util.exec([this.command(), 'controlvm', name, 'poweroff']).then(() => { - return util.exec([this.command(), 'unregistervm', name, '--delete']).then(() => { - return true; - }); - }).catch(() => { - return false; - }); + return Promise.coroutine(function* () { + if (!this.installed()) { + return Promise.reject('VirtualBox not installed.'); + } + try { + var state = yield this.vmstate(name); + if (state === 'running') { + yield util.exec([this.command(), 'controlvm', name, 'poweroff']); + } + yield util.exec([this.command(), 'unregistervm', name, '--delete']); + } catch (err) {} + }.bind(this))(); } }; diff --git a/styles/containers.less b/styles/containers.less index 9011f5aaf3..0c310ce5df 100644 --- a/styles/containers.less +++ b/styles/containers.less @@ -13,130 +13,190 @@ flex-direction: column; padding: 14px 14px 20px; - .table { - margin-bottom: 0; - .icon-arrow-right { - color: #aaa; - margin: 2px 9px 0; - flex: 0 auto; - min-width: 13px; - } - .btn { - min-width: 22px; - margin-left: 10px; - } - .table-labels { - flex: 1 auto; - display: flex; - font-size: 12px; - color: @gray-lightest; - .label-left { - flex: 0 auto; - min-width: 80px; - margin-right: 30px; - text-align: right; - } - .label-right { - flex: 1 auto; - display: inline-block; - width: 40%; - } - } - .table-values { - flex: 1 auto; - display: flex; - flex-direction: row; - margin: 8px 0; - .value-left { - text-align: right; - min-width: 80px; - flex: 0 auto; - } - .value-right { - position: relative; - flex: 0 auto; - -webkit-user-select: text; - width: 154px; - white-space: nowrap; - a { - overflow: hidden; - text-overflow: ellipsis; - } - } - } - .table-new { - margin-top: 10px; - flex: 1 auto; - display: flex; - input { - padding: 0; - font-weight: 400; - } - input.new-left { - flex: 0 auto; - text-align: right; - min-width: 80px; - max-width: 80px; - } - .new-right-wrapper { - position: relative; - display: flex; - flex: 1 auto; - .new-right-placeholder { - position: absolute; - top: 3px; - left: 0; - font-weight: 400; - } - - input.new-right { - flex: 1 auto; - height: 24px; - position :relative; - padding-left: 107px; - } - } - } - - &.ports { - input { - margin-left: 6px; - margin-right: 5px; - } - } - - &.volumes { - .label-left { - min-width: 120px; - } - .value-left { - min-width: 120px; - } - .icon-arrow-right { - color: #aaa; - margin: 2px 9px 0; - } - .icon-folder-1 { - position: relative; - top: 4px; - font-size: 16px; - padding-right: 4px; - } - .btn-xs { - padding: 1px 5px; - font-size: 12px; - line-height: 1.5; - height: 22px; - } - } - } - .question { margin: 12px 6px 6px; } } } +.result-grid { + display: flex; + flex-flow: row wrap; + justify-content: flex-start; + margin-top: 10px; + overflow: auto; + .image-item { + display: flex; + width: 320px; + height: 170px; + border-radius: 4px; + border: 1px solid @gray-lightest; + background-color: white; + margin-right: 20px; + margin-bottom: 20px; + .logo { + flex: 1 auto; + min-width: 90px; + background-color: @brand-action; + justify-content: center; + text-align: center; + img { + margin-top: 15px; + } + } + .card { + padding: 10px 20px 10px 20px; + .name { + font-size: 18px; + color: @gray-darkest; + margin-bottom: 5px; + img { + margin-right: 7px; + position: relative; + top: -1px; + } + } + .description { + font-size: 12px; + color: @gray-normal; + height: 70px; + text-overflow: ellipsis; + overflow: hidden; + -webkit-box-orient: vertical; + -webkit-line-clamp: 4; + display: -webkit-box; + word-wrap: break-word; + } + .actions { + width: 190px; + padding-top: 25px; + .stars { + height: 15px; + font-size: 10px; + color: @gray-darker; + border-right: 1px solid @gray-lightest; + padding-right: 10px; + .icon { + position: relative; + font-size: 16px; + margin-right: 3px; + top: -1px; + color: @gray-darkest; + } + .text { + position: relative; + top: -6px; + } + } + .tags { + height: 15px; + font-size: 10px; + color: @gray-darker; + padding-left: 10px; + .icon { + position: relative; + font-size: 11px; + margin-right: 5px; + top: 2px; + color: @gray-darkest; + } + .text { + position: relative; + top: 0px; + } + } + .action { + flex: 1 auto; + .btn { + text-align: right; + position: relative; + float: right; + top: -7px; + } + } + display: flex; + flex-direaction: row; + position: relative; + bottom: 0px; + } + } + } +} + +.new-container { + display: flex; + flex: 1 auto; + flex-direction: column; + padding: 35px 20px 32px 25px; + .results { + display: flex; + flex-direction: column; + flex: 1 auto; + .no-results { + flex: 1 auto; + display: flex; + align-items: center; + } + } + .new-container-header { + margin-bottom: 18px; + display: flex; + flex: 0 auto; + .text { + flex: 1 auto; + width: 50%; + font-size: 14px; + color: @gray-lighter; + } + .search { + flex: 1 auto; + margin-right: 30px; + .search-bar { + top: -7px; + position: relative; + .loading { + position: absolute; + left: 10px; + top: 7px; + width: 16px; + height: 16px; + -webkit-animation-name: spin; + -webkit-animation-duration: 1.8s; + -webkit-animation-iteration-count: infinite; + -webkit-animation-timing-function: linear; + } + .search-icon { + font-size: 18px; + color: @gray-lighter; + position: absolute; + top: 5px; + left: 10px; + } + input { + border-radius: 20px; + font-size: 12px; + height: 30px; + padding: 4px 8px 4px 35px; + color: @gray-darkest; + margin-bottom: 3px; + border-color: @gray-lightest; + box-shadow: none; + + &:focus { + box-shadow: none; + border-color: @gray-lighter; + } + + &::-webkit-input-placeholder { + color: #CCC; + font-weight: 400; + } + } + } + } + } +} + .containers { box-sizing: border-box; height: 100%; @@ -147,22 +207,26 @@ display: flex; flex-direction: row; + padding: 0px; + .sidebar { + padding-top: 28px; + background-color: white; display: flex; flex-direction: column; - min-width: 280px; + min-width: 260px; margin: 0; box-sizing: border-box; - border-right: 1px solid #eee; + border-right: 1px solid #DCE2E2; .sidebar-header { flex: 0 auto; min-width: 240px; - min-height: 42px; + min-height: 47px; display: flex; border-bottom: 1px solid transparent; transition: border-bottom 0.25s; - padding: 0px 10px 0px 10px; + //padding: 0px 10px 0px 10px; &.sep { border-bottom: 1px solid #eee; @@ -171,37 +235,37 @@ h4 { align-self: flex-start; - padding: 0 24px; + //padding: 0 24px; + padding-left: 26px; margin: 14px 0 0; display: inline-block; - font-size: 14px; position: relative; } .create { flex: 1 auto; text-align: right; - /*.btn { - margin-top: 4px; - padding: 4px 7px; - font-size: 16px; - position: relative; - .icon { - position: relative; - top: 3px; - left: 1px; + margin-right: 20px; + margin-top: 3px; + + .btn-new { + font-size: 24px; + color: @brand-action; + transition: all 0.25s; + &:hover { + color: darken(@brand-action, 10%); } - }*/ + } } } .sidebar-containers { position: relative; flex: 1 auto; - overflow-y: scroll; + overflow-y: auto; overflow-x: hidden; box-sizing: border-box; - max-width: 280px; + max-width: 260px; &.sep { border-top: 1px solid #eee; @@ -209,33 +273,43 @@ ul { margin: 0; - min-width: 240px; padding: 0; - margin-top: 4px; display: flex; flex-direction: column; + .new-container-item { + .info { + position: relative; + top: 9px; + } + } + a { color: inherit; flex-shrink: 0; cursor: default; - margin: 0px 3px 0px 0; outline: none; - padding: 4px 13px; - &.active { background: @brand-primary; li { + height: 57px; border-bottom: none; + background-image: linear-gradient(-180deg, #24B8EB 4%, #24A3EB 100%); .name { color: white; } .image { color: white; - opacity: 0.9; + opacity: 0.8; + } + .btn-delete { + font-size: 24px; + color: white; + } + .state-new { + .at2x('container-white.png', 20px, 20px); } - .state-running { .at2x('running-white.png', 20px, 20px); @@ -246,7 +320,6 @@ .state-stopped { .at2x('stopped-white.png', 20px, 20px); } - .state-downloading { .at2x('downloading-white.png', 20px, 20px); @@ -268,10 +341,11 @@ li { vertical-align: middle; - padding: 10px 16px 10px 16px; + padding: 10px 16px 10px 26px; display: flex; flex-direction: row; + height: 57px; .info { @@ -295,6 +369,19 @@ } } + .action { + display: none; + flex: 1; + position: relative; + top: 5px; + text-align: right; + margin-right: 4px; + .btn-delete { + font-size: 24px; + color: @gray-lighter; + } + } + .state { margin-top: 9px; display: inline-block; @@ -315,6 +402,10 @@ .at2x('paused.png', 20px, 20px); } + .state-new { + .at2x('container.png', 20px, 20px); + } + .state-downloading { .at2x('downloading.png', 20px, 20px); overflow: hidden; @@ -385,6 +476,7 @@ } .details { + background-color: #F9F9F9; margin: 0; padding: 0; box-sizing: border-box; @@ -394,16 +486,125 @@ display: flex; flex-direction: column; + .details-subheader { + flex: 0 auto; + display: flex; + flex-direction: row; + position: relative; + //border-top: 1px solid #EEE; + border-bottom: 1px solid #DCE2E2; + background-color: white; + height: 57px; + padding: 6px 10px 10px 24px; + font-size: 13px; + color: @gray-normal; + + .image { + flex: 1 auto; + //margin: 7px 0px 0px 16px; + margin-top: 1px; + font-size: 13px; + color: @gray-normal; + //font-weight: 300; + img { + width: 30px; + height: 18px; + position: relative; + top: -2px; + margin-right: 10px; + } + } + + .details-header-actions { + flex: 1 auto; + text-align: left; + margin-top: -12px; + .action { + display: inline-block; + .action-icon { + color: @gray-normal; + font-size: 30px; + margin-right: 20px; + } + .btn-label { + position: relative; + top: 0px; + display: block; + color: @brand-action; + font-size: 10px; + &.run { + left: 8px; + } + &.restart { + left: 1px; + } + &.terminal { + left: -2px; + } + visibility: hidden; + } + } + } + + .details-subheader-tabs { + flex: 1 auto; + text-align: right; + margin-right: 3px; + margin-top: 3px; + .tab { + margin-left: 16px; + padding: 6px 10px; + font-weight: 400; + &:hover { + border-radius: 40px; + background-color: #F9F9F9; + } + &.active { + border-radius: 40px; + color: white; + background-image: linear-gradient(-180deg, #24B8EB 4%, #24A3EB 100%); + } + } + } + } + .details-header { flex: 0 auto; display: flex; - flex-direction: column; - padding: 4px 40px 10px 40px; + flex-direction: row; + padding: 31px 24px 18px 24px; position: relative; - border-bottom: 1px solid #eee; + background-color: white; + height: 75px; + h1 { + margin: 0; + font-size: 20px; + font-weight: 400; + margin: 0; + color: @gray-darkest; + } + .status { + font-size: 10px; + font-weight: 500; + position: relative; + top: 8px; + left: 14px; + &.running { + color: @brand-positive; + } + &.paused { + color: @gray-lighter; + } + &.stopped { + color: @gray-lighter; + } + &.downloading { + color: @brand-action; + } + } - .details-header-actions { - flex: 0 auto; + /*.details-header-actions { + flex: 1; display: flex; flex-direction: row; margin-top: 24px; @@ -429,68 +630,279 @@ z-index: 0; } } - } - - .details-header-info { - display: flex; - flex-direction: row; - a { - position: absolute; - right: 30px; - top: -4px; - } - h1 { - margin: 0; - font-size: 20px; - margin: 0; - color: @gray-darkest; - } - h2 { - &.status { - margin: 8px 0px 0px 16px; - text-transform: uppercase; - font-weight: bold; - font-size: 10px; - &.running { - color: @brand-positive; - } - } - &.image-label { - margin: 8px 0px 0px 30px; - font-size: 10px; - color: @gray-lighter; - } - &.image { - margin: 5px 0px 0px 16px; - font-size: 14px; - color: @gray-normal; - } - } - } + }*/ } .details-progress { - margin: 26% auto 0; + margin: 20% auto 0; text-align: center; width: 300px; + h2 { + margin-bottom: 20px; + } } .details-panel { flex: 1; overflow: auto; - .logs { + background-color: #FFF; + &.home { + background-color: #F9F9F9; + overflow: hidden; + .content { + display: flex; + flex: 1 auto; + flex-direction: row; + padding: 10px 27px; + .left { + width: 60%; + flex-direction: column; + .web-preview { + margin-right: 30px; + .subtext { + text-align: right; + color: @gray-lightest; + margin-top: 2px; + } + .widget { + background-color: white; + width: 100%; + height: 100%; + border-radius: 4px; + border: 1px solid @gray-lightest; + position: relative; + iframe { + border: 0; + border-radius: 4px; + /*width: 100%; + height: 100%;*/ + position: relative; + top: -50%; + left: -50%; + width: 200%; + height: 200%; + transform: scale(0.5); + } + .iframe-overlay { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + z-index: 100; + color: transparent; + transition: all 0.25s; + .icon { + margin-top: 40%; + display: block; + font-size: 60px; + text-align: center; + } + .text { + font-size: 20px; + text-align: center; + } + &:hover { + color: white; + background-color: @gray-darkest; + opacity: 0.75; + } + } + } + } + } + .right { + width: 40%; + flex-direction: column; + .mini-logs { + margin-bottom: 50px; + .widget { + position: relative; + border-radius: 4px; + border: 1px solid @gray-lightest; + background-color: @gray-darkest; + color: @gray-lightest; + height: 100%; + padding: 10px; + overflow: hidden; + font-family: Menlo; + font-size: 8px; + white-space: pre-wrap; + p { + margin-bottom: 0px; + } + .mini-logs-overlay { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + z-index: 100; + color: transparent; + transition: all 0.25s; + .icon { + margin-top: 25%; + display: block; + font-size: 60px; + text-align: center; + } + .text { + font-family: "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif; + font-size: 20px; + text-align: center; + } + &:hover { + color: white; + background-color: @gray-darkest; + opacity: 0.75; + } + } + } + } + .folders { + .subtext { + text-align: right; + color: @gray-lightest; + margin-top: 2px; + } + .widget { + padding: 20px 10px; + background-color: white; + border-radius: 4px; + border: 1px solid @gray-lightest; + display: flex; + .folder { + width: 100px; + img { + display: block; + margin: 0 auto; + } + .text { + text-align: center; + } + } + } + } + } + } + } + &.logs { + background-color: @gray-darkest; -webkit-user-select: text; font-family: Menlo; font-size: 12px; - padding: 18px 35px; - color: lighten(@gray-normal, 6%); + padding: 20px 18px; + color: @gray-lightest; white-space: pre-wrap; p { - margin: 0 6px; + margin-bottom: 0px; } } .settings { - padding: 18px 35px; + padding: 18px 38px; + .settings-section { + margin-bottom: 40px; + } + } + .ports { + padding: 18px 38px; + } + .volumes { + padding: 18px 38px; + } + + .table { + margin-bottom: 0; + .icon-arrow-right { + color: #aaa; + margin: 2px 9px 0; + flex: 0 auto; + min-width: 13px; + } + .btn { + min-width: 22px; + margin-left: 10px; + } + .table-labels { + margin-top: 20px; + flex: 1 auto; + display: flex; + font-size: 12px; + color: @gray-lightest; + .label-left { + flex: 0 auto; + min-width: 80px; + margin-right: 30px; + text-align: right; + } + .label-right { + flex: 1 auto; + display: inline-block; + width: 40%; + } + } + .table-values { + flex: 1 auto; + display: flex; + flex-direction: row; + margin: 8px 0; + .value-left { + text-align: right; + min-width: 80px; + flex: 0 auto; + } + .value-right { + flex: 1 auto; + -webkit-user-select: text; + width: 40%; + } + } + .table-new { + margin-top: 10px; + flex: 1 auto; + display: flex; + input { + padding: 0; + font-weight: 400; + } + input.new-left { + flex: 0 auto; + text-align: right; + min-width: 80px; + max-width: 80px; + } + .new-right-wrapper { + position: relative; + display: flex; + flex: 1 auto; + .new-right-placeholder { + position: absolute; + top: 3px; + left: 0; + font-weight: 400; + } + + input.new-right { + flex: 1 auto; + height: 24px; + position :relative; + padding-left: 107px; + } + } + } + + &.volumes { + .label-left { + min-width: 120px; + } + .value-left { + min-width: 120px; + } + .icon { + color: #aaa; + margin: 2px 9px 0; + } + } } } @@ -507,6 +919,7 @@ color: @gray-lightest; margin-left: 5px; margin-bottom: 5px; + margin-top: 20px; .label-key { display: inline-block; margin-right: 30px; diff --git a/styles/header.less b/styles/header.less index 4731611def..5eaca39d6a 100644 --- a/styles/header.less +++ b/styles/header.less @@ -1,9 +1,10 @@ @import "bootstrap/bootstrap.less"; .header { + position: absolute; min-width: 100%; flex: 0; - min-height: 50px; + min-height: 30px; -webkit-app-region: drag; -webkit-user-select: none; // border-bottom: 1px solid #efefef; @@ -12,11 +13,19 @@ -webkit-app-region: no-drag; } + .logo { + position: relative; + float: right; + top: 10px; + right: 10px; + z-index: 1000; + } + .buttons { display: inline-block; position: relative; - top: 16px; - left: 20px; + top: 10px; + left: 15px; &:hover { .button-minimize.enabled { @@ -44,9 +53,21 @@ border-radius: 6px; box-shadow: 0px 1px 1px 0px rgba(234,234,234,0.50); -webkit-app-region: no-drag; - + &.red { + background-color: #FF5F52; + border-color: #E33E32; + } + &.yellow { + background-color: #FFBE05; + border-color: #E2A100; + } + &.green { + background-color: #15CC35; + border-color: #17B230; + } &.disabled { - border: 1px solid #E8EEEF; + background-color: #DDDDDD; + border: 1px solid #D3D3D3; } &.enabled:hover { diff --git a/styles/main.less b/styles/main.less index 621115cd26..55c669b146 100644 --- a/styles/main.less +++ b/styles/main.less @@ -15,9 +15,8 @@ html, body { height: 100%; width: 100%; overflow: hidden; - -webkit-font-smoothing: antialiased; -webkit-user-select: none; - font-family: 'Clear Sans', sans-serif; + font-family: "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif; cursor: default; img { @@ -25,7 +24,7 @@ html, body { } } -::-webkit-scrollbar { +/*::-webkit-scrollbar { width: 13px; } @@ -46,7 +45,7 @@ html, body { &:hover { background-color: rgba(0,0,0,0.25); } -} +}*/ .question { color: @gray-lightest; diff --git a/styles/radial.less b/styles/radial.less index 4e989d16f8..4f68f23bfc 100644 --- a/styles/radial.less +++ b/styles/radial.less @@ -12,12 +12,12 @@ .radial-progress { &.radial-spinner { - -webkit-animation: rotating 2.4s linear infinite; + -webkit-animation: rotating 1.6s linear infinite; } @circle-size: 140px; @circle-background: #F2F2F2; - @inset-size: 136px; + @inset-size: @circle-size - 4; @inset-color: white; @transition-length: 1s; // @percentage-color: #3FD899; @@ -28,7 +28,6 @@ width: @circle-size; height: @circle-size; - background-color: @circle-background; border-radius: 100%; .circle { .mask, .fill, .shadow { diff --git a/styles/setup.less b/styles/setup.less index 2d2ac1f5ce..801d268149 100644 --- a/styles/setup.less +++ b/styles/setup.less @@ -3,7 +3,7 @@ height: 100%; width: 100%; flex-direction: row; - -webkit-app-region: drag; + //-webkit-app-region: drag; .image { display: flex; @@ -13,12 +13,13 @@ align-items: center; justify-content: flex-end; padding-right: 40px; + padding-left: 80px; .contents { position: relative; .detail { position: absolute; - right: 0; + right: -20px; bottom: 0; } } @@ -36,13 +37,24 @@ max-width: 320px; h1 { - margin-top: -30px; + color: @gray-darkest; font-size: 24px; } - + h4 { + color: @gray-lightest; + font-size: 13px; + margin-top: -30px; + } p { font-size: 13px; color: @gray-normal; + &.error { + color: @brand-negative; + background-color: lighten(@brand-negative, 32%); + padding: 10px; + border-radius: 4px; + -webkit-user-select: text; + } } } diff --git a/styles/theme.less b/styles/theme.less index f40f8f5a5b..2a404974b3 100644 --- a/styles/theme.less +++ b/styles/theme.less @@ -5,6 +5,11 @@ @import "bootstrap/variables.less"; @import "bootstrap/mixins.less"; +h2 { + font-size: 18px; + color: @gray-normal; +} + h3 { font-size: 14px; color: @gray-darkest; @@ -12,8 +17,8 @@ h3 { h4 { font-size: 13px; - color: @gray-normal; - font-weight: 400; + color: @gray-darker; + font-weight: 500; } .popover-content { @@ -28,7 +33,7 @@ input[type="text"] { color: @gray-normal; font-weight: 300; padding: 5px; - transition: all 0.1s; + transition: all 0.25s; &:focus { outline: 0; border-bottom: 1px solid @brand-action; @@ -56,7 +61,7 @@ input[type="text"] { // Mixin for generating new styles .btn-styles(@btn-color: @gray-normal) { - transition: all 0.1s; + transition: all 0.25s; .reset-filter(); // Disable gradients for IE9 because filter bleeds through rounded corners border-color: @btn-color; color: @btn-color; @@ -118,16 +123,16 @@ input[type="text"] { // Common styles .btn { - font-size: 12px; + font-size: 13px; background-color: transparent; color: @gray-normal; border: 1px solid @gray-normal; - border-radius: 25px; + border-radius: 40px; box-shadow: none; font-weight: 400; text-shadow: none; - padding: 6px 14px 6px 14px; - height: 32px; + padding: 4px 14px 4px 14px; + height: 28px; cursor: default; &.small { @@ -173,6 +178,7 @@ input[type="text"] { &.only-icon { padding: 6px 7px 6px 7px; &.small { + width: 22px; padding: 2px 5px 3px 5px; } } diff --git a/styles/variables.less b/styles/variables.less index cff01eb030..ba3833fa96 100644 --- a/styles/variables.less +++ b/styles/variables.less @@ -1,7 +1,7 @@ @brand-primary: #24B8EB; @brand-action: #24B8EB; -@brand-positive: #65E100; -@brand-negative: #F47A45; +@brand-positive: #15CC35; +@brand-negative: #FF5F52; @gray-darkest: #253237; @gray-darker: #394C51; diff --git a/tests/Boot2Docker-integration.js b/tests/Boot2Docker-integration.js deleted file mode 100644 index c5ef5c5bd8..0000000000 --- a/tests/Boot2Docker-integration.js +++ /dev/null @@ -1,57 +0,0 @@ -var boot2docker = require('../build/Boot2Docker'); -var path = require('path'); -var fs = require('fs'); -var packagejson = JSON.parse(fs.readFileSync(path.join(__dirname, '..', 'package.json'), 'utf8')); - -describe('Boot2Docker', () => { - it('cli version is correct', done => { - boot2docker.cliversion().then(version => { - expect(version).toBe(packagejson['boot2docker-version']); - done(); - }); - }); - - describe('with an existing & running boot2docker vm', () => { - beforeAll(done => { - boot2docker.init().then(boot2docker.start).then(() => { - done(); - }); - }); - - it('creates a vm', done => { - boot2docker.exists().then(exists => { - expect(exists).toBe(true); - done(); - }); - }); - - it('detects the correct state of running vm', done => { - boot2docker.status().then(status => { - expect(status).toBe('running'); - done(); - }); - }); - - it('detects ssh keys', () => { - expect(boot2docker.haskeys()).toBe(true); - }); - - it('receives an ip address from the vm', done => { - boot2docker.ip().then(ip => { - expect(ip).toMatch(/\b\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\b/); - done(); - }); - }); - - it('reads a version from the boot2docker iso file', done => { - boot2docker.isoversion().then(version => { - expect(version).toMatch(/\d+\.\d+\.\d+/); - done(); - }); - }); - - afterAll(done => { - boot2docker.destroy().finally(done); - }); - }); -}); diff --git a/tests/SetupStore-integration.js b/tests/SetupStore-integration.js deleted file mode 100644 index a26c089e7c..0000000000 --- a/tests/SetupStore-integration.js +++ /dev/null @@ -1,91 +0,0 @@ -var virtualbox = require('../build/Virtualbox'); -var SetupStore = require('../build/SetupStore'); -var setupUtil = require('../build/SetupUtil'); -var path = require('path'); -var fs = require('fs'); -var Promise = require('bluebird'); -var packagejson = JSON.parse(fs.readFileSync(path.join(__dirname, '..', 'package.json'), 'utf8')); - -jasmine.DEFAULT_TIMEOUT_INTERVAL = 300000; // 5 minutes for integration tests - -describe('Setup', function () { - - describe('with virtualbox installed', function () { - - // Before each teardown the boot2docker VM, keys and anything else - - describe('and with a kitematic vm', function () { - - }); - - describe('and without a boot2docker vm', function () { - - }); - - describe('and with an old boot2docker vm', function () { - - }); - - describe('and with a very old boot2docker vm', function () { - - }); - - describe('and with a boot2docker vm running', function () { - - }); - - describe('and with a boot2docker vm but with no ssh keys', function () { - - }); - - describe('and with a boot2docker vm being powered off', function () { - - }); - - describe('and with a boot2docker vm being removed', function () { - - }); - - describe('and with a boot2docker vm initialized but not running', function () { - - }); - }); - - /*describe('with virtualbox downloaded', function () { - beforeEach(function (done) { - Promise.coroutine(SetupStore.downloadVirtualboxStep)().finally(function () { - if (virtualbox.installed()) { - virtualbox.kill().finally(function () { - done(); - }); - } else { - done(); - } - }); - }); - - it('install virtualbox succeeds', function (done) { - Promise.coroutine(SetupStore.installVirtualboxStep)().finally(function () { - expect(virtualbox.installed()).toBe(true); - done(); - }); - }); - });*/ - - /*describe('without virtualbox installed or downloaded', function () { - var virtualboxFile = path.join(setupUtil.supportDir(), packagejson['virtualbox-filename']); - beforeEach(function () { - if (fs.existsSync(virtualboxFile)) { - fs.unlinkSync(virtualboxFile); - } - spyOn(virtualbox, 'installed').and.returnValue(false); - }); - - it('downloads virtualbox from the official website', function (done) { - Promise.coroutine(SetupStore.downloadVirtualboxStep)().finally(function () { - expect(fs.existsSync(virtualboxFile)).toBe(true); - done(); - }); - }); - });*/ -}); diff --git a/tests/SetupUtil-integration.js b/tests/SetupUtil-integration.js deleted file mode 100644 index ef1a4bbbdf..0000000000 --- a/tests/SetupUtil-integration.js +++ /dev/null @@ -1,10 +0,0 @@ -var setupUtil = require('../build/SetupUtil'); - -describe('SetupUtils', function() { - it('returns live sha256 checksum for a given virtualbox version & filename', function (done) { - setupUtil.virtualboxSHA256('4.3.20', 'VirtualBox-4.3.20-96996-OSX.dmg').then(function (checksum) { - expect(checksum).toBe('744e77119a640a5974160213c9912568a3d88dbd06a2fc6b6970070941732705'); - done(); - }); - }); -}); diff --git a/tests/Virtualbox-integration.js b/tests/Virtualbox-integration.js deleted file mode 100644 index 5317c7bd09..0000000000 --- a/tests/Virtualbox-integration.js +++ /dev/null @@ -1,56 +0,0 @@ -var virtualbox = require('../build/Virtualbox'); -var util = require('../build/Util'); - -describe('Virtualbox', function () { - beforeAll(function () { - // Make sure VirtualBox is installed - }); - - describe('with a running VM', function () { - beforeEach(function (done) { - return util.exec([virtualbox.command(), 'createvm', '--name', 'km-test', '--register']).finally(function () { - return util.exec([virtualbox.command(), 'startvm', 'km-test', '--type', 'headless']); - }).then(function() { - done(); - }).catch(function () { - done(); - }); - }); - - it('powers off all vms', function (done) { - virtualbox.poweroffall().then(function () { - return virtualbox.vmstate('km-test'); - }).then(function (state) { - expect(state).toBe('poweroff'); - done(); - }).catch(function (err) { - expect(err).toBeFalsy(); - done(); - }); - }); - - it('destroys a vm', function (done) { - virtualbox.vmdestroy('km-test').then(function () { - return util.exec([virtualbox.command(), 'showvminfo', 'km-test']).then(function () { - done(); - }).catch(function (err) { - expect(err).toBeTruthy(); - done(); - }); - }).catch(function (err) { - console.log(err); - done(); - }); - }); - - afterEach(function (done) { - util.exec([virtualbox.command(), 'controlvm', 'km-test', 'poweroff']).finally(function () { - return util.exec([virtualbox.command(), 'unregistervm', 'km-test', '--delete']); - }).then(function () { - done(); - }).catch(function () { - done(); - }); - }); - }); -}); diff --git a/tests/Virtualbox-test.js b/tests/Virtualbox-test.js deleted file mode 100644 index 59ad644bd5..0000000000 --- a/tests/Virtualbox-test.js +++ /dev/null @@ -1,21 +0,0 @@ -var virtualbox = require('../build/Virtualbox'); -var util = require('../build/Util'); -var Promise = require('bluebird'); - -describe('Virtualbox', function () { - it('returns the right command', function () { - expect(virtualbox.command()).toBe('/usr/bin/VBoxManage'); - }); - - describe('version 4.3.20r96996', function () { - beforeEach(function () { - spyOn(util, 'exec').and.returnValue(Promise.resolve('4.3.20r96996')); - }); - it('correctly parses virtualbox version', function (done) { - virtualbox.version().then(function (version) { - expect(version).toBe('4.3.20'); - done(); - }); - }); - }); -}); diff --git a/tests/jasmine-2.1.3/boot.js b/tests/jasmine-2.1.3/boot.js deleted file mode 100755 index 164f068b09..0000000000 --- a/tests/jasmine-2.1.3/boot.js +++ /dev/null @@ -1,120 +0,0 @@ -/** - Starting with version 2.0, this file "boots" Jasmine, performing all of the necessary initialization before executing the loaded environment and all of a project's specs. This file should be loaded after `jasmine.js` and `jasmine_html.js`, but before any project source files or spec files are loaded. Thus this file can also be used to customize Jasmine for a project. - - If a project is using Jasmine via the standalone distribution, this file can be customized directly. If a project is using Jasmine via the [Ruby gem][jasmine-gem], this file can be copied into the support directory via `jasmine copy_boot_js`. Other environments (e.g., Python) will have different mechanisms. - - The location of `boot.js` can be specified and/or overridden in `jasmine.yml`. - - [jasmine-gem]: http://github.com/pivotal/jasmine-gem - */ - -(function() { - - /** - * ## Require & Instantiate - * - * Require Jasmine's core files. Specifically, this requires and attaches all of Jasmine's code to the `jasmine` reference. - */ - window.jasmine = jasmineRequire.core(jasmineRequire); - - /** - * Since this is being run in a browser and the results should populate to an HTML page, require the HTML-specific Jasmine code, injecting the same reference. - */ - jasmineRequire.html(jasmine); - - /** - * Create the Jasmine environment. This is used to run all specs in a project. - */ - var env = jasmine.getEnv(); - - /** - * ## The Global Interface - * - * Build up the functions that will be exposed as the Jasmine public interface. A project can customize, rename or alias any of these functions as desired, provided the implementation remains unchanged. - */ - var jasmineInterface = jasmineRequire.interface(jasmine, env); - - /** - * Add all of the Jasmine global/public interface to the proper global, so a project can use the public interface directly. For example, calling `describe` in specs instead of `jasmine.getEnv().describe`. - */ - if (typeof window == "undefined" && typeof exports == "object") { - extend(exports, jasmineInterface); - } else { - extend(window, jasmineInterface); - } - - /** - * ## Runner Parameters - * - * More browser specific code - wrap the query string in an object and to allow for getting/setting parameters from the runner user interface. - */ - - var queryString = new jasmine.QueryString({ - getWindowLocation: function() { return window.location; } - }); - - var catchingExceptions = queryString.getParam("catch"); - env.catchExceptions(typeof catchingExceptions === "undefined" ? true : catchingExceptions); - - /** - * ## Reporters - * The `HtmlReporter` builds all of the HTML UI for the runner page. This reporter paints the dots, stars, and x's for specs, as well as all spec names and all failures (if any). - */ - var htmlReporter = new jasmine.HtmlReporter({ - env: env, - onRaiseExceptionsClick: function() { queryString.setParam("catch", !env.catchingExceptions()); }, - getContainer: function() { return document.body; }, - createElement: function() { return document.createElement.apply(document, arguments); }, - createTextNode: function() { return document.createTextNode.apply(document, arguments); }, - timer: new jasmine.Timer() - }); - - /** - * The `jsApiReporter` also receives spec results, and is used by any environment that needs to extract the results from JavaScript. - */ - env.addReporter(jasmineInterface.jsApiReporter); - env.addReporter(htmlReporter); - - /** - * Filter which specs will be run by matching the start of the full name against the `spec` query param. - */ - var specFilter = new jasmine.HtmlSpecFilter({ - filterString: function() { return queryString.getParam("spec"); } - }); - - env.specFilter = function(spec) { - return specFilter.matches(spec.getFullName()); - }; - - /** - * Setting up timing functions to be able to be overridden. Certain browsers (Safari, IE 8, phantomjs) require this hack. - */ - window.setTimeout = window.setTimeout; - window.setInterval = window.setInterval; - window.clearTimeout = window.clearTimeout; - window.clearInterval = window.clearInterval; - - /** - * ## Execution - * - * Replace the browser window's `onload`, ensure it's called, and then run all of the loaded specs. This includes initializing the `HtmlReporter` instance and then executing the loaded Jasmine environment. All of this will happen after all of the specs are loaded. - */ - var currentWindowOnload = window.onload; - - window.onload = function() { - if (currentWindowOnload) { - currentWindowOnload(); - } - htmlReporter.initialize(); - env.execute(); - }; - - /** - * Helper function for readability above. - */ - function extend(destination, source) { - for (var property in source) destination[property] = source[property]; - return destination; - } - -}()); diff --git a/tests/jasmine-2.1.3/console.js b/tests/jasmine-2.1.3/console.js deleted file mode 100755 index 96026ab63a..0000000000 --- a/tests/jasmine-2.1.3/console.js +++ /dev/null @@ -1,188 +0,0 @@ -/* -Copyright (c) 2008-2014 Pivotal Labs - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -*/ -function getJasmineRequireObj() { - if (typeof module !== 'undefined' && module.exports) { - return exports; - } else { - window.jasmineRequire = window.jasmineRequire || {}; - return window.jasmineRequire; - } -} - -getJasmineRequireObj().console = function(jRequire, j$) { - j$.ConsoleReporter = jRequire.ConsoleReporter(); -}; - -getJasmineRequireObj().ConsoleReporter = function() { - - var noopTimer = { - start: function(){}, - elapsed: function(){ return 0; } - }; - - function ConsoleReporter(options) { - var print = options.print, - showColors = options.showColors || false, - onComplete = options.onComplete || function() {}, - timer = options.timer || noopTimer, - specCount, - failureCount, - failedSpecs = [], - pendingCount, - ansi = { - green: '\x1B[32m', - red: '\x1B[31m', - yellow: '\x1B[33m', - none: '\x1B[0m' - }, - failedSuites = []; - - this.jasmineStarted = function() { - specCount = 0; - failureCount = 0; - pendingCount = 0; - print('Started'); - printNewline(); - timer.start(); - }; - - this.jasmineDone = function() { - printNewline(); - for (var i = 0; i < failedSpecs.length; i++) { - specFailureDetails(failedSpecs[i]); - } - - if(specCount > 0) { - printNewline(); - - var specCounts = specCount + ' ' + plural('spec', specCount) + ', ' + - failureCount + ' ' + plural('failure', failureCount); - - if (pendingCount) { - specCounts += ', ' + pendingCount + ' pending ' + plural('spec', pendingCount); - } - - print(specCounts); - } else { - print('No specs found'); - } - - printNewline(); - var seconds = timer.elapsed() / 1000; - print('Finished in ' + seconds + ' ' + plural('second', seconds)); - printNewline(); - - for(i = 0; i < failedSuites.length; i++) { - suiteFailureDetails(failedSuites[i]); - } - - onComplete(failureCount === 0); - }; - - this.specDone = function(result) { - specCount++; - - if (result.status == 'pending') { - pendingCount++; - print(colored('yellow', '*')); - return; - } - - if (result.status == 'passed') { - print(colored('green', '.')); - return; - } - - if (result.status == 'failed') { - failureCount++; - failedSpecs.push(result); - print(colored('red', 'F')); - } - }; - - this.suiteDone = function(result) { - if (result.failedExpectations && result.failedExpectations.length > 0) { - failureCount++; - failedSuites.push(result); - } - }; - - return this; - - function printNewline() { - print('\n'); - } - - function colored(color, str) { - return showColors ? (ansi[color] + str + ansi.none) : str; - } - - function plural(str, count) { - return count == 1 ? str : str + 's'; - } - - function repeat(thing, times) { - var arr = []; - for (var i = 0; i < times; i++) { - arr.push(thing); - } - return arr; - } - - function indent(str, spaces) { - var lines = (str || '').split('\n'); - var newArr = []; - for (var i = 0; i < lines.length; i++) { - newArr.push(repeat(' ', spaces).join('') + lines[i]); - } - return newArr.join('\n'); - } - - function specFailureDetails(result) { - printNewline(); - print(result.fullName); - - for (var i = 0; i < result.failedExpectations.length; i++) { - var failedExpectation = result.failedExpectations[i]; - printNewline(); - print(indent(failedExpectation.message, 2)); - print(indent(failedExpectation.stack, 2)); - } - - printNewline(); - } - - function suiteFailureDetails(result) { - for (var i = 0; i < result.failedExpectations.length; i++) { - printNewline(); - print(colored('red', 'An error was thrown in an afterAll')); - printNewline(); - print(colored('red', 'AfterAll ' + result.failedExpectations[i].message)); - - } - printNewline(); - } - } - - return ConsoleReporter; -}; diff --git a/tests/jasmine-2.1.3/jasmine-html.js b/tests/jasmine-2.1.3/jasmine-html.js deleted file mode 100755 index 898108b77d..0000000000 --- a/tests/jasmine-2.1.3/jasmine-html.js +++ /dev/null @@ -1,404 +0,0 @@ -/* -Copyright (c) 2008-2014 Pivotal Labs - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -*/ -jasmineRequire.html = function(j$) { - j$.ResultsNode = jasmineRequire.ResultsNode(); - j$.HtmlReporter = jasmineRequire.HtmlReporter(j$); - j$.QueryString = jasmineRequire.QueryString(); - j$.HtmlSpecFilter = jasmineRequire.HtmlSpecFilter(); -}; - -jasmineRequire.HtmlReporter = function(j$) { - - var noopTimer = { - start: function() {}, - elapsed: function() { return 0; } - }; - - function HtmlReporter(options) { - var env = options.env || {}, - getContainer = options.getContainer, - createElement = options.createElement, - createTextNode = options.createTextNode, - onRaiseExceptionsClick = options.onRaiseExceptionsClick || function() {}, - timer = options.timer || noopTimer, - results = [], - specsExecuted = 0, - failureCount = 0, - pendingSpecCount = 0, - htmlReporterMain, - symbols, - failedSuites = []; - - this.initialize = function() { - clearPrior(); - htmlReporterMain = createDom('div', {className: 'jasmine_html-reporter'}, - createDom('div', {className: 'banner'}, - createDom('a', {className: 'title', href: 'http://jasmine.github.io/', target: '_blank'}), - createDom('span', {className: 'version'}, j$.version) - ), - createDom('ul', {className: 'symbol-summary'}), - createDom('div', {className: 'alert'}), - createDom('div', {className: 'results'}, - createDom('div', {className: 'failures'}) - ) - ); - getContainer().appendChild(htmlReporterMain); - - symbols = find('.symbol-summary'); - }; - - var totalSpecsDefined; - this.jasmineStarted = function(options) { - totalSpecsDefined = options.totalSpecsDefined || 0; - timer.start(); - }; - - var summary = createDom('div', {className: 'summary'}); - - var topResults = new j$.ResultsNode({}, '', null), - currentParent = topResults; - - this.suiteStarted = function(result) { - currentParent.addChild(result, 'suite'); - currentParent = currentParent.last(); - }; - - this.suiteDone = function(result) { - if (result.status == 'failed') { - failedSuites.push(result); - } - - if (currentParent == topResults) { - return; - } - - currentParent = currentParent.parent; - }; - - this.specStarted = function(result) { - currentParent.addChild(result, 'spec'); - }; - - var failures = []; - this.specDone = function(result) { - if(noExpectations(result) && typeof console !== 'undefined' && typeof console.error !== 'undefined') { - console.error('Spec \'' + result.fullName + '\' has no expectations.'); - } - - if (result.status != 'disabled') { - specsExecuted++; - } - - symbols.appendChild(createDom('li', { - className: noExpectations(result) ? 'empty' : result.status, - id: 'spec_' + result.id, - title: result.fullName - } - )); - - if (result.status == 'failed') { - failureCount++; - - var failure = - createDom('div', {className: 'spec-detail failed'}, - createDom('div', {className: 'description'}, - createDom('a', {title: result.fullName, href: specHref(result)}, result.fullName) - ), - createDom('div', {className: 'messages'}) - ); - var messages = failure.childNodes[1]; - - for (var i = 0; i < result.failedExpectations.length; i++) { - var expectation = result.failedExpectations[i]; - messages.appendChild(createDom('div', {className: 'result-message'}, expectation.message)); - messages.appendChild(createDom('div', {className: 'stack-trace'}, expectation.stack)); - } - - failures.push(failure); - } - - if (result.status == 'pending') { - pendingSpecCount++; - } - }; - - this.jasmineDone = function() { - var banner = find('.banner'); - banner.appendChild(createDom('span', {className: 'duration'}, 'finished in ' + timer.elapsed() / 1000 + 's')); - - var alert = find('.alert'); - - alert.appendChild(createDom('span', { className: 'exceptions' }, - createDom('label', { className: 'label', 'for': 'raise-exceptions' }, 'raise exceptions'), - createDom('input', { - className: 'raise', - id: 'raise-exceptions', - type: 'checkbox' - }) - )); - var checkbox = find('#raise-exceptions'); - - checkbox.checked = !env.catchingExceptions(); - checkbox.onclick = onRaiseExceptionsClick; - - if (specsExecuted < totalSpecsDefined) { - var skippedMessage = 'Ran ' + specsExecuted + ' of ' + totalSpecsDefined + ' specs - run all'; - alert.appendChild( - createDom('span', {className: 'bar skipped'}, - createDom('a', {href: '?', title: 'Run all specs'}, skippedMessage) - ) - ); - } - var statusBarMessage = ''; - var statusBarClassName = 'bar '; - - if (totalSpecsDefined > 0) { - statusBarMessage += pluralize('spec', specsExecuted) + ', ' + pluralize('failure', failureCount); - if (pendingSpecCount) { statusBarMessage += ', ' + pluralize('pending spec', pendingSpecCount); } - statusBarClassName += (failureCount > 0) ? 'failed' : 'passed'; - } else { - statusBarClassName += 'skipped'; - statusBarMessage += 'No specs found'; - } - - alert.appendChild(createDom('span', {className: statusBarClassName}, statusBarMessage)); - - for(i = 0; i < failedSuites.length; i++) { - var failedSuite = failedSuites[i]; - for(var j = 0; j < failedSuite.failedExpectations.length; j++) { - var errorBarMessage = 'AfterAll ' + failedSuite.failedExpectations[j].message; - var errorBarClassName = 'bar errored'; - alert.appendChild(createDom('span', {className: errorBarClassName}, errorBarMessage)); - } - } - - var results = find('.results'); - results.appendChild(summary); - - summaryList(topResults, summary); - - function summaryList(resultsTree, domParent) { - var specListNode; - for (var i = 0; i < resultsTree.children.length; i++) { - var resultNode = resultsTree.children[i]; - if (resultNode.type == 'suite') { - var suiteListNode = createDom('ul', {className: 'suite', id: 'suite-' + resultNode.result.id}, - createDom('li', {className: 'suite-detail'}, - createDom('a', {href: specHref(resultNode.result)}, resultNode.result.description) - ) - ); - - summaryList(resultNode, suiteListNode); - domParent.appendChild(suiteListNode); - } - if (resultNode.type == 'spec') { - if (domParent.getAttribute('class') != 'specs') { - specListNode = createDom('ul', {className: 'specs'}); - domParent.appendChild(specListNode); - } - var specDescription = resultNode.result.description; - if(noExpectations(resultNode.result)) { - specDescription = 'SPEC HAS NO EXPECTATIONS ' + specDescription; - } - specListNode.appendChild( - createDom('li', { - className: resultNode.result.status, - id: 'spec-' + resultNode.result.id - }, - createDom('a', {href: specHref(resultNode.result)}, specDescription) - ) - ); - } - } - } - - if (failures.length) { - alert.appendChild( - createDom('span', {className: 'menu bar spec-list'}, - createDom('span', {}, 'Spec List | '), - createDom('a', {className: 'failures-menu', href: '#'}, 'Failures'))); - alert.appendChild( - createDom('span', {className: 'menu bar failure-list'}, - createDom('a', {className: 'spec-list-menu', href: '#'}, 'Spec List'), - createDom('span', {}, ' | Failures '))); - - find('.failures-menu').onclick = function() { - setMenuModeTo('failure-list'); - }; - find('.spec-list-menu').onclick = function() { - setMenuModeTo('spec-list'); - }; - - setMenuModeTo('failure-list'); - - var failureNode = find('.failures'); - for (var i = 0; i < failures.length; i++) { - failureNode.appendChild(failures[i]); - } - } - }; - - return this; - - function find(selector) { - return getContainer().querySelector('.jasmine_html-reporter ' + selector); - } - - function clearPrior() { - // return the reporter - var oldReporter = find(''); - - if(oldReporter) { - getContainer().removeChild(oldReporter); - } - } - - function createDom(type, attrs, childrenVarArgs) { - var el = createElement(type); - - for (var i = 2; i < arguments.length; i++) { - var child = arguments[i]; - - if (typeof child === 'string') { - el.appendChild(createTextNode(child)); - } else { - if (child) { - el.appendChild(child); - } - } - } - - for (var attr in attrs) { - if (attr == 'className') { - el[attr] = attrs[attr]; - } else { - el.setAttribute(attr, attrs[attr]); - } - } - - return el; - } - - function pluralize(singular, count) { - var word = (count == 1 ? singular : singular + 's'); - - return '' + count + ' ' + word; - } - - function specHref(result) { - return '?spec=' + encodeURIComponent(result.fullName); - } - - function setMenuModeTo(mode) { - htmlReporterMain.setAttribute('class', 'jasmine_html-reporter ' + mode); - } - - function noExpectations(result) { - return (result.failedExpectations.length + result.passedExpectations.length) === 0 && - result.status === 'passed'; - } - } - - return HtmlReporter; -}; - -jasmineRequire.HtmlSpecFilter = function() { - function HtmlSpecFilter(options) { - var filterString = options && options.filterString() && options.filterString().replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&'); - var filterPattern = new RegExp(filterString); - - this.matches = function(specName) { - return filterPattern.test(specName); - }; - } - - return HtmlSpecFilter; -}; - -jasmineRequire.ResultsNode = function() { - function ResultsNode(result, type, parent) { - this.result = result; - this.type = type; - this.parent = parent; - - this.children = []; - - this.addChild = function(result, type) { - this.children.push(new ResultsNode(result, type, this)); - }; - - this.last = function() { - return this.children[this.children.length - 1]; - }; - } - - return ResultsNode; -}; - -jasmineRequire.QueryString = function() { - function QueryString(options) { - - this.setParam = function(key, value) { - var paramMap = queryStringToParamMap(); - paramMap[key] = value; - options.getWindowLocation().search = toQueryString(paramMap); - }; - - this.getParam = function(key) { - return queryStringToParamMap()[key]; - }; - - return this; - - function toQueryString(paramMap) { - var qStrPairs = []; - for (var prop in paramMap) { - qStrPairs.push(encodeURIComponent(prop) + '=' + encodeURIComponent(paramMap[prop])); - } - return '?' + qStrPairs.join('&'); - } - - function queryStringToParamMap() { - var paramStr = options.getWindowLocation().search.substring(1), - params = [], - paramMap = {}; - - if (paramStr.length > 0) { - params = paramStr.split('&'); - for (var i = 0; i < params.length; i++) { - var p = params[i].split('='); - var value = decodeURIComponent(p[1]); - if (value === 'true' || value === 'false') { - value = JSON.parse(value); - } - paramMap[decodeURIComponent(p[0])] = value; - } - } - - return paramMap; - } - - } - - return QueryString; -}; diff --git a/tests/jasmine-2.1.3/jasmine.css b/tests/jasmine-2.1.3/jasmine.css deleted file mode 100755 index 7ae5834879..0000000000 --- a/tests/jasmine-2.1.3/jasmine.css +++ /dev/null @@ -1,62 +0,0 @@ -body { overflow-y: scroll; } - -.jasmine_html-reporter { background-color: #eeeeee; padding: 5px; margin: -8px; font-size: 11px; font-family: Monaco, "Lucida Console", monospace; line-height: 14px; color: #333333; } -.jasmine_html-reporter a { text-decoration: none; } -.jasmine_html-reporter a:hover { text-decoration: underline; } -.jasmine_html-reporter p, .jasmine_html-reporter h1, .jasmine_html-reporter h2, .jasmine_html-reporter h3, .jasmine_html-reporter h4, .jasmine_html-reporter h5, .jasmine_html-reporter h6 { margin: 0; line-height: 14px; } -.jasmine_html-reporter .banner, .jasmine_html-reporter .symbol-summary, .jasmine_html-reporter .summary, .jasmine_html-reporter .result-message, .jasmine_html-reporter .spec .description, .jasmine_html-reporter .spec-detail .description, .jasmine_html-reporter .alert .bar, .jasmine_html-reporter .stack-trace { padding-left: 9px; padding-right: 9px; } -.jasmine_html-reporter .banner { position: relative; } -.jasmine_html-reporter .banner .title { background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFoAAAAZCAMAAACGusnyAAACdlBMVEX/////AP+AgICqVaqAQICZM5mAVYCSSZKAQICOOY6ATYCLRouAQICJO4mSSYCIRIiPQICHPIeOR4CGQ4aMQICGPYaLRoCFQ4WKQICPPYWJRYCOQoSJQICNPoSIRICMQoSHQICHRICKQoOHQICKPoOJO4OJQYOMQICMQ4CIQYKLQICIPoKLQ4CKQICNPoKJQISMQ4KJQoSLQYKJQISLQ4KIQoSKQYKIQICIQISMQoSKQYKLQIOLQoOJQYGLQIOKQIOMQoGKQYOLQYGKQIOLQoGJQYOJQIOKQYGJQIOKQoGKQIGLQIKLQ4KKQoGLQYKJQIGKQYKJQIGKQIKJQoGKQYKLQIGKQYKLQIOJQoKKQoOJQYKKQIOJQoKKQoOKQIOLQoKKQYOLQYKJQIOKQoKKQYKKQoKJQYOKQYKLQIOKQoKLQYOKQYKLQIOJQoGKQYKJQYGJQoGKQYKLQoGLQYGKQoGJQYKKQYGJQIKKQoGJQYKLQIKKQYGLQYKKQYGKQYGKQYKJQYOKQoKJQYOKQYKLQYOLQYOKQYKLQYOKQoKKQYKKQYOKQYOJQYKKQYKLQYKKQIKKQoKKQYKKQYKKQoKJQIKKQYKLQYKKQYKKQIKKQYKKQYKKQYKKQIKKQYKJQYGLQYGKQYKKQYKKQYGKQIKKQYGKQYOJQoKKQYOLQYKKQYOKQoKKQYKKQoKKQYKKQYKJQYKLQYKKQYKKQYKKQYKKQYKKQYKKQYKKQYKKQYKJQYKKQYKKQYKKQYKKQYKKQYKKQYKKQYKKQYKKQYKKQYKKQYKLQYKKQYKKQYKKQYKKQYKKQYKKQYKKQYKKQYKKQYKKQYKKQYKKQYKmIDpEAAAA0XRSTlMAAQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyAiIyQlJycoKissLS4wMTQ1Njc4OTo7PDw+P0BCQ0RISUpLTE1OUFNUVVdYWFlaW15fYGFiY2ZnaGlqa2xtb3BxcnN0dnh5ent8fX5/gIGChIWIioyNjo+QkZOUlZaYmZqbnJ2eoKGio6WmqKmsra6vsLGztre4ubq7vL2+wMHDxMjJysvNzs/Q0dLU1tfY2dvc3t/g4eLj5ebn6Onq6+zt7u/w8vP09fb3+Pn6+/z9/vkVQXAAAAMaSURBVHhe5dXxV1N1GMfxz2ABbDgIAm5VDJOyVDIJLUMaVpBWUZUaGbmqoGpZRSiGiRWp6KoZ5AB0ZY50RImZQIlahKkMYXv/R90dBvET/rJfOr3Ouc8v99zPec59zvf56j+vYKlViSf7250X4Mr3O29Tgq08BdGB4DhcekEJ5YkQKFsgWZdtj9JpV+I8xPjLFqkrsEIqO8PHSpis36jWazcqjEsfJjkvRssVU37SdIOu4XCf5vEJPsnwJpnRNU9JmxhMk8l1gehIrq7hTFjzOD+Vf88629qKMJVNltInFeRexRQyJlNeqd1iGDlSzrIUIyXbyFfm3RYprcQRe7lqtWyGYbfc6dT0R2vmdOOkX3u55C1rP37ftiH+tDby4r/RBT0w8TyEkr+epB9XgPDmSYYWbrhCuFYaIyw3fDQAXTnSkh+ANofiHmWf9l+FY1I90FdQTetstO00o23novzVsJ7uB3/C5TkbjRwZ5JerwV4iRWq9HFbFMaK/d0TYqayRiQPuIxxS3Bu8JWU90/60tKi7vkhaznez0a/TbVOKj5CaOZh6fWG6/Lyv9B/ZLR1gw/S/fpbeVD3MCW1li6SvWDOn65tr99/uvWtBS0XDm4s1t+sOHpG0kpBKx/l77wOSnxLpcx6TXmXLTPQOKYOf9Q1dfr8/SJ2mFdCvl1Yl93DiHUZvXeLJbGSzYu5gVJ2slbSakOR8dxCq5adQ2oFLqsE9Ex3L4qQO0eOPeU5x56bypXp4onSEb5OkICX6lDat55TeoztNKQcJaakrz9KCb95oD69IKq+yKW4XPjknaS52V0TZqE2cTtXjcHSCRmUO88e+85hj3EP74i9p8pylw7lxgMDyyl6OV7ZejnjNMfatu87LxRbH0IS35gt2a4ZjmGpVBdKK3Wr6INk8jWWSGqbA55CKgjBRC6E9w78ydTg3ABS3AFV1QN0Y4Aa2pgEjWnQURj9L0ayK6R2ysEqxHUKzYnLvvyU+i9KM2JHJzE4vyZOyDcOwOsySajeLPc8sNvPJkFlyJd20wpqAzZeAfZ3oWybxd+P/3j+SG3uSBdf2VQAAAABJRU5ErkJggg==') no-repeat; background: url('data:image/svg+xml;base64,<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->

<svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:cc="http://creativecommons.org/ns#"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   version="1.1"
   width="681.96252"
   height="187.5"
   id="svg2"
   xml:space="preserve"><metadata
     id="metadata8"><rdf:RDF><cc:Work
         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
     id="defs6"><clipPath
       id="clipPath18"><path
         d="M 0,1500 0,0 l 5455.74,0 0,1500 L 0,1500 z"
         inkscape:connector-curvature="0"
         id="path20" /></clipPath></defs><g
     transform="matrix(1.25,0,0,-1.25,0,187.5)"
     id="g10"><g
       transform="scale(0.1,0.1)"
       id="g12"><g
         id="g14"><g
           clip-path="url(#clipPath18)"
           id="g16"><path
             d="m 1544,599.434 c 0.92,-40.352 25.68,-81.602 71.53,-81.602 27.51,0 47.68,12.832 61.44,35.754 12.83,22.93 12.83,56.852 12.83,82.527 l 0,329.184 -71.52,0 0,104.543 266.83,0 0,-104.543 -70.6,0 0,-344.77 c 0,-58.691 -3.68,-104.531 -44.93,-152.218 -36.68,-42.18 -96.28,-66.02 -153.14,-66.02 -117.37,0 -207.24,77.941 -202.64,197.145 l 130.2,0"
             inkscape:connector-curvature="0"
             id="path22"
             style="fill:#8a4182;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
             d="m 2301.4,662.695 c 0,80.703 -66.94,145.813 -147.63,145.813 -83.44,0 -147.63,-68.781 -147.63,-151.301 0,-79.785 66.94,-145.801 145.8,-145.801 84.35,0 149.46,67.852 149.46,151.289 z m -1.83,-181.547 c -35.77,-54.097 -93.53,-78.859 -157.72,-78.859 -140.3,0 -251.24,116.449 -251.24,254.918 0,142.129 113.7,260.41 256.74,260.41 63.27,0 118.29,-29.336 152.22,-82.523 l 0,69.687 175.14,0 0,-104.527 -61.44,0 0,-280.598 61.44,0 0,-104.527 -175.14,0 0,66.019"
             inkscape:connector-curvature="0"
             id="path24"
             style="fill:#8a4182;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
             d="m 2622.33,557.258 c 3.67,-44.016 33.01,-73.348 78.86,-73.348 33.93,0 66.93,23.824 66.93,60.504 0,48.606 -45.84,56.856 -83.44,66.941 -85.28,22.004 -178.81,48.606 -178.81,155.879 0,93.536 78.86,147.633 165.98,147.633 44,0 83.43,-9.176 110.94,-44.008 l 0,33.922 82.53,0 0,-132.965 -108.21,0 c -1.83,34.856 -28.42,57.774 -63.26,57.774 -30.26,0 -62.35,-17.422 -62.35,-51.348 0,-45.847 44.93,-55.93 80.69,-64.18 88.02,-20.175 182.47,-47.695 182.47,-157.734 0,-99.027 -83.44,-154.039 -175.13,-154.039 -49.53,0 -94.46,15.582 -126.55,53.18 l 0,-40.34 -85.27,0 0,142.129 114.62,0"
             inkscape:connector-curvature="0"
             id="path26"
             style="fill:#8a4182;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
             d="m 2988.18,800.254 -63.26,0 0,104.527 165.05,0 0,-73.355 c 31.18,51.347 78.86,85.277 141.21,85.277 67.85,0 124.71,-41.258 152.21,-102.699 26.6,62.351 92.62,102.699 160.47,102.699 53.19,0 105.46,-22 141.21,-62.351 38.52,-44.938 38.52,-93.532 38.52,-149.457 l 0,-185.239 63.27,0 0,-104.527 -238.42,0 0,104.527 63.28,0 0,157.715 c 0,32.102 0,60.527 -14.67,88.957 -18.34,26.582 -48.61,40.344 -79.77,40.344 -30.26,0 -63.28,-12.844 -82.53,-36.672 -22.93,-29.355 -22.93,-56.863 -22.93,-92.629 l 0,-157.715 63.27,0 0,-104.527 -238.41,0 0,104.527 63.28,0 0,150.383 c 0,29.348 0,66.023 -14.67,91.699 -15.59,29.336 -47.69,44.934 -80.7,44.934 -31.18,0 -57.77,-11.008 -77.94,-35.774 -24.77,-30.253 -26.6,-62.343 -26.6,-99.941 l 0,-151.301 63.27,0 0,-104.527 -238.4,0 0,104.527 63.26,0 0,280.598"
             inkscape:connector-curvature="0"
             id="path28"
             style="fill:#8a4182;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
             d="m 3998.66,951.547 -111.87,0 0,118.293 111.87,0 0,-118.293 z m 0,-431.891 63.27,0 0,-104.527 -239.33,0 0,104.527 64.19,0 0,280.598 -63.27,0 0,104.527 175.14,0 0,-385.125"
             inkscape:connector-curvature="0"
             id="path30"
             style="fill:#8a4182;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
             d="m 4159.12,800.254 -63.27,0 0,104.527 175.14,0 0,-69.687 c 29.35,54.101 84.36,80.699 144.87,80.699 53.19,0 105.45,-22.016 141.22,-60.527 40.34,-44.934 41.26,-88.032 41.26,-143.957 l 0,-191.653 63.27,0 0,-104.527 -238.4,0 0,104.527 63.26,0 0,158.637 c 0,30.262 0,61.434 -19.26,88.035 -20.17,26.582 -53.18,39.414 -86.19,39.414 -33.93,0 -68.77,-13.75 -88.94,-41.25 -21.09,-27.5 -21.09,-69.687 -21.09,-102.707 l 0,-142.129 63.26,0 0,-104.527 -238.4,0 0,104.527 63.27,0 0,280.598"
             inkscape:connector-curvature="0"
             id="path32"
             style="fill:#8a4182;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
             d="m 5082.48,703.965 c -19.24,70.605 -81.6,115.547 -154.04,115.547 -66.04,0 -129.3,-51.348 -143.05,-115.547 l 297.09,0 z m 85.27,-144.883 c -38.51,-93.523 -129.27,-156.793 -231.05,-156.793 -143.07,0 -257.68,111.871 -257.68,255.836 0,144.883 109.12,261.328 254.91,261.328 67.87,0 135.72,-30.258 183.39,-78.863 48.62,-51.344 68.79,-113.695 68.79,-183.383 l -3.67,-39.434 -396.13,0 c 14.67,-67.863 77.03,-117.363 146.72,-117.363 48.59,0 90.76,18.328 118.28,58.672 l 116.44,0"
             inkscape:connector-curvature="0"
             id="path34"
             style="fill:#8a4182;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
             d="m 690.895,850.703 90.75,0 22.543,31.035 0,243.122 -135.829,0 0,-243.141 22.536,-31.016"
             inkscape:connector-curvature="0"
             id="path36"
             style="fill:#8a4182;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
             d="m 632.395,742.258 28.039,86.304 -22.551,31.04 -231.223,75.128 -41.976,-129.183 231.257,-75.137 36.454,11.848"
             inkscape:connector-curvature="0"
             id="path38"
             style="fill:#8a4182;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
             d="m 717.449,653.105 -73.41,53.36 -36.488,-11.875 -142.903,-196.692 109.883,-79.828 142.918,196.703 0,38.332"
             inkscape:connector-curvature="0"
             id="path40"
             style="fill:#8a4182;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
             d="m 828.52,706.465 -73.426,-53.34 0.011,-38.359 L 898.004,418.07 1007.9,497.898 864.973,694.609 828.52,706.465"
             inkscape:connector-curvature="0"
             id="path42"
             style="fill:#8a4182;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
             d="m 812.086,828.586 28.055,-86.32 36.484,-11.836 231.225,75.117 -41.97,129.183 -231.239,-75.14 -22.555,-31.004"
             inkscape:connector-curvature="0"
             id="path44"
             style="fill:#8a4182;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
             d="m 736.301,1335.88 c -323.047,0 -585.875,-262.78 -585.875,-585.782 0,-323.118 262.828,-585.977 585.875,-585.977 323.019,0 585.809,262.859 585.809,585.977 0,323.002 -262.79,585.782 -585.809,585.782 l 0,0 z m 0,-118.61 c 257.972,0 467.189,-209.13 467.189,-467.172 0,-258.129 -209.217,-467.348 -467.189,-467.348 -258.074,0 -467.254,209.219 -467.254,467.348 0,258.042 209.18,467.172 467.254,467.172"
             inkscape:connector-curvature="0"
             id="path46"
             style="fill:#8a4182;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
             d="m 1091.13,619.883 -175.771,57.121 11.629,35.808 175.762,-57.121 -11.62,-35.808"
             inkscape:connector-curvature="0"
             id="path48"
             style="fill:#8a4182;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
             d="M 866.957,902.074 836.5,924.199 945.121,1073.73 975.586,1051.61 866.957,902.074"
             inkscape:connector-curvature="0"
             id="path50"
             style="fill:#8a4182;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
             d="M 607.465,903.445 498.855,1052.97 529.32,1075.1 637.93,925.566 607.465,903.445"
             inkscape:connector-curvature="0"
             id="path52"
             style="fill:#8a4182;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
             d="m 380.688,622.129 -11.626,35.801 175.758,57.09 11.621,-35.801 -175.753,-57.09"
             inkscape:connector-curvature="0"
             id="path54"
             style="fill:#8a4182;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
             d="m 716.289,376.59 37.6406,0 0,184.816 -37.6406,0 0,-184.816 z"
             inkscape:connector-curvature="0"
             id="path56"
             style="fill:#8a4182;fill-opacity:1;fill-rule:nonzero;stroke:none" /></g></g></g></g></svg>') no-repeat, none; -webkit-background-size: 100%; -moz-background-size: 100%; -o-background-size: 100%; background-size: 100%; display: block; float: left; width: 90px; height: 25px; } -.jasmine_html-reporter .banner .version { margin-left: 14px; position: relative; top: 6px; } -.jasmine_html-reporter .banner .duration { position: absolute; right: 14px; top: 6px; } -.jasmine_html-reporter #jasmine_content { position: fixed; right: 100%; } -.jasmine_html-reporter .version { color: #aaaaaa; } -.jasmine_html-reporter .banner { margin-top: 14px; } -.jasmine_html-reporter .duration { color: #aaaaaa; float: right; } -.jasmine_html-reporter .symbol-summary { overflow: hidden; *zoom: 1; margin: 14px 0; } -.jasmine_html-reporter .symbol-summary li { display: inline-block; height: 8px; width: 14px; font-size: 16px; } -.jasmine_html-reporter .symbol-summary li.passed { font-size: 14px; } -.jasmine_html-reporter .symbol-summary li.passed:before { color: #007069; content: "\02022"; } -.jasmine_html-reporter .symbol-summary li.failed { line-height: 9px; } -.jasmine_html-reporter .symbol-summary li.failed:before { color: #ca3a11; content: "\d7"; font-weight: bold; margin-left: -1px; } -.jasmine_html-reporter .symbol-summary li.disabled { font-size: 14px; } -.jasmine_html-reporter .symbol-summary li.disabled:before { color: #bababa; content: "\02022"; } -.jasmine_html-reporter .symbol-summary li.pending { line-height: 17px; } -.jasmine_html-reporter .symbol-summary li.pending:before { color: #ba9d37; content: "*"; } -.jasmine_html-reporter .symbol-summary li.empty { font-size: 14px; } -.jasmine_html-reporter .symbol-summary li.empty:before { color: #ba9d37; content: "\02022"; } -.jasmine_html-reporter .exceptions { color: #fff; float: right; margin-top: 5px; margin-right: 5px; } -.jasmine_html-reporter .bar { line-height: 28px; font-size: 14px; display: block; color: #eee; } -.jasmine_html-reporter .bar.failed { background-color: #ca3a11; } -.jasmine_html-reporter .bar.passed { background-color: #007069; } -.jasmine_html-reporter .bar.skipped { background-color: #bababa; } -.jasmine_html-reporter .bar.errored { background-color: #ca3a11; } -.jasmine_html-reporter .bar.menu { background-color: #fff; color: #aaaaaa; } -.jasmine_html-reporter .bar.menu a { color: #333333; } -.jasmine_html-reporter .bar a { color: white; } -.jasmine_html-reporter.spec-list .bar.menu.failure-list, .jasmine_html-reporter.spec-list .results .failures { display: none; } -.jasmine_html-reporter.failure-list .bar.menu.spec-list, .jasmine_html-reporter.failure-list .summary { display: none; } -.jasmine_html-reporter .running-alert { background-color: #666666; } -.jasmine_html-reporter .results { margin-top: 14px; } -.jasmine_html-reporter.showDetails .summaryMenuItem { font-weight: normal; text-decoration: inherit; } -.jasmine_html-reporter.showDetails .summaryMenuItem:hover { text-decoration: underline; } -.jasmine_html-reporter.showDetails .detailsMenuItem { font-weight: bold; text-decoration: underline; } -.jasmine_html-reporter.showDetails .summary { display: none; } -.jasmine_html-reporter.showDetails #details { display: block; } -.jasmine_html-reporter .summaryMenuItem { font-weight: bold; text-decoration: underline; } -.jasmine_html-reporter .summary { margin-top: 14px; } -.jasmine_html-reporter .summary ul { list-style-type: none; margin-left: 14px; padding-top: 0; padding-left: 0; } -.jasmine_html-reporter .summary ul.suite { margin-top: 7px; margin-bottom: 7px; } -.jasmine_html-reporter .summary li.passed a { color: #007069; } -.jasmine_html-reporter .summary li.failed a { color: #ca3a11; } -.jasmine_html-reporter .summary li.empty a { color: #ba9d37; } -.jasmine_html-reporter .summary li.pending a { color: #ba9d37; } -.jasmine_html-reporter .description + .suite { margin-top: 0; } -.jasmine_html-reporter .suite { margin-top: 14px; } -.jasmine_html-reporter .suite a { color: #333333; } -.jasmine_html-reporter .failures .spec-detail { margin-bottom: 28px; } -.jasmine_html-reporter .failures .spec-detail .description { background-color: #ca3a11; } -.jasmine_html-reporter .failures .spec-detail .description a { color: white; } -.jasmine_html-reporter .result-message { padding-top: 14px; color: #333333; white-space: pre; } -.jasmine_html-reporter .result-message span.result { display: block; } -.jasmine_html-reporter .stack-trace { margin: 5px 0 0 0; max-height: 224px; overflow: auto; line-height: 18px; color: #666666; border: 1px solid #ddd; background: white; white-space: pre; } diff --git a/tests/jasmine-2.1.3/jasmine.js b/tests/jasmine-2.1.3/jasmine.js deleted file mode 100755 index 1ccb640964..0000000000 --- a/tests/jasmine-2.1.3/jasmine.js +++ /dev/null @@ -1,2908 +0,0 @@ -/* -Copyright (c) 2008-2014 Pivotal Labs - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -*/ -getJasmineRequireObj = (function (jasmineGlobal) { - var jasmineRequire; - - if (typeof module !== 'undefined' && module.exports) { - jasmineGlobal = global; - jasmineRequire = exports; - } else { - jasmineRequire = jasmineGlobal.jasmineRequire = jasmineGlobal.jasmineRequire || {}; - } - - function getJasmineRequire() { - return jasmineRequire; - } - - getJasmineRequire().core = function(jRequire) { - var j$ = {}; - - jRequire.base(j$, jasmineGlobal); - j$.util = jRequire.util(); - j$.Any = jRequire.Any(); - j$.CallTracker = jRequire.CallTracker(); - j$.MockDate = jRequire.MockDate(); - j$.Clock = jRequire.Clock(); - j$.DelayedFunctionScheduler = jRequire.DelayedFunctionScheduler(); - j$.Env = jRequire.Env(j$); - j$.ExceptionFormatter = jRequire.ExceptionFormatter(); - j$.Expectation = jRequire.Expectation(); - j$.buildExpectationResult = jRequire.buildExpectationResult(); - j$.JsApiReporter = jRequire.JsApiReporter(); - j$.matchersUtil = jRequire.matchersUtil(j$); - j$.ObjectContaining = jRequire.ObjectContaining(j$); - j$.pp = jRequire.pp(j$); - j$.QueueRunner = jRequire.QueueRunner(j$); - j$.ReportDispatcher = jRequire.ReportDispatcher(); - j$.Spec = jRequire.Spec(j$); - j$.SpyRegistry = jRequire.SpyRegistry(j$); - j$.SpyStrategy = jRequire.SpyStrategy(); - j$.Suite = jRequire.Suite(); - j$.Timer = jRequire.Timer(); - j$.version = jRequire.version(); - - j$.matchers = jRequire.requireMatchers(jRequire, j$); - - return j$; - }; - - return getJasmineRequire; -})(this); - -getJasmineRequireObj().requireMatchers = function(jRequire, j$) { - var availableMatchers = [ - 'toBe', - 'toBeCloseTo', - 'toBeDefined', - 'toBeFalsy', - 'toBeGreaterThan', - 'toBeLessThan', - 'toBeNaN', - 'toBeNull', - 'toBeTruthy', - 'toBeUndefined', - 'toContain', - 'toEqual', - 'toHaveBeenCalled', - 'toHaveBeenCalledWith', - 'toMatch', - 'toThrow', - 'toThrowError' - ], - matchers = {}; - - for (var i = 0; i < availableMatchers.length; i++) { - var name = availableMatchers[i]; - matchers[name] = jRequire[name](j$); - } - - return matchers; -}; - -getJasmineRequireObj().base = function(j$, jasmineGlobal) { - j$.unimplementedMethod_ = function() { - throw new Error('unimplemented method'); - }; - - j$.MAX_PRETTY_PRINT_DEPTH = 40; - j$.MAX_PRETTY_PRINT_ARRAY_LENGTH = 100; - j$.DEFAULT_TIMEOUT_INTERVAL = 5000; - - j$.getGlobal = function() { - return jasmineGlobal; - }; - - j$.getEnv = function(options) { - var env = j$.currentEnv_ = j$.currentEnv_ || new j$.Env(options); - //jasmine. singletons in here (setTimeout blah blah). - return env; - }; - - j$.isArray_ = function(value) { - return j$.isA_('Array', value); - }; - - j$.isString_ = function(value) { - return j$.isA_('String', value); - }; - - j$.isNumber_ = function(value) { - return j$.isA_('Number', value); - }; - - j$.isA_ = function(typeName, value) { - return Object.prototype.toString.apply(value) === '[object ' + typeName + ']'; - }; - - j$.isDomNode = function(obj) { - return obj.nodeType > 0; - }; - - j$.any = function(clazz) { - return new j$.Any(clazz); - }; - - j$.objectContaining = function(sample) { - return new j$.ObjectContaining(sample); - }; - - j$.createSpy = function(name, originalFn) { - - var spyStrategy = new j$.SpyStrategy({ - name: name, - fn: originalFn, - getSpy: function() { return spy; } - }), - callTracker = new j$.CallTracker(), - spy = function() { - var callData = { - object: this, - args: Array.prototype.slice.apply(arguments) - }; - - callTracker.track(callData); - var returnValue = spyStrategy.exec.apply(this, arguments); - callData.returnValue = returnValue; - - return returnValue; - }; - - for (var prop in originalFn) { - if (prop === 'and' || prop === 'calls') { - throw new Error('Jasmine spies would overwrite the \'and\' and \'calls\' properties on the object being spied upon'); - } - - spy[prop] = originalFn[prop]; - } - - spy.and = spyStrategy; - spy.calls = callTracker; - - return spy; - }; - - j$.isSpy = function(putativeSpy) { - if (!putativeSpy) { - return false; - } - return putativeSpy.and instanceof j$.SpyStrategy && - putativeSpy.calls instanceof j$.CallTracker; - }; - - j$.createSpyObj = function(baseName, methodNames) { - if (!j$.isArray_(methodNames) || methodNames.length === 0) { - throw 'createSpyObj requires a non-empty array of method names to create spies for'; - } - var obj = {}; - for (var i = 0; i < methodNames.length; i++) { - obj[methodNames[i]] = j$.createSpy(baseName + '.' + methodNames[i]); - } - return obj; - }; -}; - -getJasmineRequireObj().util = function() { - - var util = {}; - - util.inherit = function(childClass, parentClass) { - var Subclass = function() { - }; - Subclass.prototype = parentClass.prototype; - childClass.prototype = new Subclass(); - }; - - util.htmlEscape = function(str) { - if (!str) { - return str; - } - return str.replace(/&/g, '&') - .replace(//g, '>'); - }; - - util.argsToArray = function(args) { - var arrayOfArgs = []; - for (var i = 0; i < args.length; i++) { - arrayOfArgs.push(args[i]); - } - return arrayOfArgs; - }; - - util.isUndefined = function(obj) { - return obj === void 0; - }; - - util.arrayContains = function(array, search) { - var i = array.length; - while (i--) { - if (array[i] === search) { - return true; - } - } - return false; - }; - - util.clone = function(obj) { - if (Object.prototype.toString.apply(obj) === '[object Array]') { - return obj.slice(); - } - - var cloned = {}; - for (var prop in obj) { - if (obj.hasOwnProperty(prop)) { - cloned[prop] = obj[prop]; - } - } - - return cloned; - }; - - return util; -}; - -getJasmineRequireObj().Spec = function(j$) { - function Spec(attrs) { - this.expectationFactory = attrs.expectationFactory; - this.resultCallback = attrs.resultCallback || function() {}; - this.id = attrs.id; - this.description = attrs.description || ''; - this.queueableFn = attrs.queueableFn; - this.beforeAndAfterFns = attrs.beforeAndAfterFns || function() { return {befores: [], afters: []}; }; - this.userContext = attrs.userContext || function() { return {}; }; - this.onStart = attrs.onStart || function() {}; - this.getSpecName = attrs.getSpecName || function() { return ''; }; - this.expectationResultFactory = attrs.expectationResultFactory || function() { }; - this.queueRunnerFactory = attrs.queueRunnerFactory || function() {}; - this.catchingExceptions = attrs.catchingExceptions || function() { return true; }; - - if (!this.queueableFn.fn) { - this.pend(); - } - - this.result = { - id: this.id, - description: this.description, - fullName: this.getFullName(), - failedExpectations: [], - passedExpectations: [] - }; - } - - Spec.prototype.addExpectationResult = function(passed, data) { - var expectationResult = this.expectationResultFactory(data); - if (passed) { - this.result.passedExpectations.push(expectationResult); - } else { - this.result.failedExpectations.push(expectationResult); - } - }; - - Spec.prototype.expect = function(actual) { - return this.expectationFactory(actual, this); - }; - - Spec.prototype.execute = function(onComplete) { - var self = this; - - this.onStart(this); - - if (this.markedPending || this.disabled) { - complete(); - return; - } - - var fns = this.beforeAndAfterFns(); - var allFns = fns.befores.concat(this.queueableFn).concat(fns.afters); - - this.queueRunnerFactory({ - queueableFns: allFns, - onException: function() { self.onException.apply(self, arguments); }, - onComplete: complete, - userContext: this.userContext() - }); - - function complete() { - self.result.status = self.status(); - self.resultCallback(self.result); - - if (onComplete) { - onComplete(); - } - } - }; - - Spec.prototype.onException = function onException(e) { - if (Spec.isPendingSpecException(e)) { - this.pend(); - return; - } - - this.addExpectationResult(false, { - matcherName: '', - passed: false, - expected: '', - actual: '', - error: e - }); - }; - - Spec.prototype.disable = function() { - this.disabled = true; - }; - - Spec.prototype.pend = function() { - this.markedPending = true; - }; - - Spec.prototype.status = function() { - if (this.disabled) { - return 'disabled'; - } - - if (this.markedPending) { - return 'pending'; - } - - if (this.result.failedExpectations.length > 0) { - return 'failed'; - } else { - return 'passed'; - } - }; - - Spec.prototype.isExecutable = function() { - return !this.disabled && !this.markedPending; - }; - - Spec.prototype.getFullName = function() { - return this.getSpecName(this); - }; - - Spec.pendingSpecExceptionMessage = '=> marked Pending'; - - Spec.isPendingSpecException = function(e) { - return !!(e && e.toString && e.toString().indexOf(Spec.pendingSpecExceptionMessage) !== -1); - }; - - return Spec; -}; - -if (typeof window == void 0 && typeof exports == 'object') { - exports.Spec = jasmineRequire.Spec; -} - -getJasmineRequireObj().Env = function(j$) { - function Env(options) { - options = options || {}; - - var self = this; - var global = options.global || j$.getGlobal(); - - var totalSpecsDefined = 0; - - var catchExceptions = true; - - var realSetTimeout = j$.getGlobal().setTimeout; - var realClearTimeout = j$.getGlobal().clearTimeout; - this.clock = new j$.Clock(global, new j$.DelayedFunctionScheduler(), new j$.MockDate(global)); - - var runnableLookupTable = {}; - var runnableResources = {}; - - var currentSpec = null; - var currentlyExecutingSuites = []; - var currentDeclarationSuite = null; - - var currentSuite = function() { - return currentlyExecutingSuites[currentlyExecutingSuites.length - 1]; - }; - - var currentRunnable = function() { - return currentSpec || currentSuite(); - }; - - var reporter = new j$.ReportDispatcher([ - 'jasmineStarted', - 'jasmineDone', - 'suiteStarted', - 'suiteDone', - 'specStarted', - 'specDone' - ]); - - this.specFilter = function() { - return true; - }; - - this.addCustomEqualityTester = function(tester) { - if(!currentRunnable()) { - throw new Error('Custom Equalities must be added in a before function or a spec'); - } - runnableResources[currentRunnable().id].customEqualityTesters.push(tester); - }; - - this.addMatchers = function(matchersToAdd) { - if(!currentRunnable()) { - throw new Error('Matchers must be added in a before function or a spec'); - } - var customMatchers = runnableResources[currentRunnable().id].customMatchers; - for (var matcherName in matchersToAdd) { - customMatchers[matcherName] = matchersToAdd[matcherName]; - } - }; - - j$.Expectation.addCoreMatchers(j$.matchers); - - var nextSpecId = 0; - var getNextSpecId = function() { - return 'spec' + nextSpecId++; - }; - - var nextSuiteId = 0; - var getNextSuiteId = function() { - return 'suite' + nextSuiteId++; - }; - - var expectationFactory = function(actual, spec) { - return j$.Expectation.Factory({ - util: j$.matchersUtil, - customEqualityTesters: runnableResources[spec.id].customEqualityTesters, - customMatchers: runnableResources[spec.id].customMatchers, - actual: actual, - addExpectationResult: addExpectationResult - }); - - function addExpectationResult(passed, result) { - return spec.addExpectationResult(passed, result); - } - }; - - var defaultResourcesForRunnable = function(id, parentRunnableId) { - var resources = {spies: [], customEqualityTesters: [], customMatchers: {}}; - - if(runnableResources[parentRunnableId]){ - resources.customEqualityTesters = j$.util.clone(runnableResources[parentRunnableId].customEqualityTesters); - resources.customMatchers = j$.util.clone(runnableResources[parentRunnableId].customMatchers); - } - - runnableResources[id] = resources; - }; - - var clearResourcesForRunnable = function(id) { - spyRegistry.clearSpies(); - delete runnableResources[id]; - }; - - var beforeAndAfterFns = function(suite, runnablesExplictlySet) { - return function() { - var befores = [], - afters = [], - beforeAlls = [], - afterAlls = []; - - while(suite) { - befores = befores.concat(suite.beforeFns); - afters = afters.concat(suite.afterFns); - - if (runnablesExplictlySet()) { - beforeAlls = beforeAlls.concat(suite.beforeAllFns); - afterAlls = afterAlls.concat(suite.afterAllFns); - } - - suite = suite.parentSuite; - } - return { - befores: beforeAlls.reverse().concat(befores.reverse()), - afters: afters.concat(afterAlls) - }; - }; - }; - - var getSpecName = function(spec, suite) { - return suite.getFullName() + ' ' + spec.description; - }; - - // TODO: we may just be able to pass in the fn instead of wrapping here - var buildExpectationResult = j$.buildExpectationResult, - exceptionFormatter = new j$.ExceptionFormatter(), - expectationResultFactory = function(attrs) { - attrs.messageFormatter = exceptionFormatter.message; - attrs.stackFormatter = exceptionFormatter.stack; - - return buildExpectationResult(attrs); - }; - - // TODO: fix this naming, and here's where the value comes in - this.catchExceptions = function(value) { - catchExceptions = !!value; - return catchExceptions; - }; - - this.catchingExceptions = function() { - return catchExceptions; - }; - - var maximumSpecCallbackDepth = 20; - var currentSpecCallbackDepth = 0; - - function clearStack(fn) { - currentSpecCallbackDepth++; - if (currentSpecCallbackDepth >= maximumSpecCallbackDepth) { - currentSpecCallbackDepth = 0; - realSetTimeout(fn, 0); - } else { - fn(); - } - } - - var catchException = function(e) { - return j$.Spec.isPendingSpecException(e) || catchExceptions; - }; - - var queueRunnerFactory = function(options) { - options.catchException = catchException; - options.clearStack = options.clearStack || clearStack; - options.timer = {setTimeout: realSetTimeout, clearTimeout: realClearTimeout}; - options.fail = self.fail; - - new j$.QueueRunner(options).execute(); - }; - - var topSuite = new j$.Suite({ - env: this, - id: getNextSuiteId(), - description: 'Jasmine__TopLevel__Suite', - queueRunner: queueRunnerFactory - }); - runnableLookupTable[topSuite.id] = topSuite; - defaultResourcesForRunnable(topSuite.id); - currentDeclarationSuite = topSuite; - - this.topSuite = function() { - return topSuite; - }; - - this.execute = function(runnablesToRun) { - if(runnablesToRun) { - runnablesExplictlySet = true; - } else if (focusedRunnables.length) { - runnablesExplictlySet = true; - runnablesToRun = focusedRunnables; - } else { - runnablesToRun = [topSuite.id]; - } - - var allFns = []; - for(var i = 0; i < runnablesToRun.length; i++) { - var runnable = runnableLookupTable[runnablesToRun[i]]; - allFns.push((function(runnable) { return { fn: function(done) { runnable.execute(done); } }; })(runnable)); - } - - reporter.jasmineStarted({ - totalSpecsDefined: totalSpecsDefined - }); - - queueRunnerFactory({queueableFns: allFns, onComplete: reporter.jasmineDone}); - }; - - this.addReporter = function(reporterToAdd) { - reporter.addReporter(reporterToAdd); - }; - - var spyRegistry = new j$.SpyRegistry({currentSpies: function() { - if(!currentRunnable()) { - throw new Error('Spies must be created in a before function or a spec'); - } - return runnableResources[currentRunnable().id].spies; - }}); - - this.spyOn = function() { - return spyRegistry.spyOn.apply(spyRegistry, arguments); - }; - - var suiteFactory = function(description) { - var suite = new j$.Suite({ - env: self, - id: getNextSuiteId(), - description: description, - parentSuite: currentDeclarationSuite, - queueRunner: queueRunnerFactory, - onStart: suiteStarted, - expectationFactory: expectationFactory, - expectationResultFactory: expectationResultFactory, - resultCallback: function(attrs) { - if (!suite.disabled) { - clearResourcesForRunnable(suite.id); - currentlyExecutingSuites.pop(); - } - reporter.suiteDone(attrs); - } - }); - - runnableLookupTable[suite.id] = suite; - return suite; - - function suiteStarted(suite) { - currentlyExecutingSuites.push(suite); - defaultResourcesForRunnable(suite.id, suite.parentSuite.id); - reporter.suiteStarted(suite.result); - } - }; - - this.describe = function(description, specDefinitions) { - var suite = suiteFactory(description); - addSpecsToSuite(suite, specDefinitions); - return suite; - }; - - this.xdescribe = function(description, specDefinitions) { - var suite = this.describe(description, specDefinitions); - suite.disable(); - return suite; - }; - - var focusedRunnables = []; - - this.fdescribe = function(description, specDefinitions) { - var suite = suiteFactory(description); - suite.isFocused = true; - - focusedRunnables.push(suite.id); - unfocusAncestor(); - addSpecsToSuite(suite, specDefinitions); - - return suite; - }; - - function addSpecsToSuite(suite, specDefinitions) { - var parentSuite = currentDeclarationSuite; - parentSuite.addChild(suite); - currentDeclarationSuite = suite; - - var declarationError = null; - try { - specDefinitions.call(suite); - } catch (e) { - declarationError = e; - } - - if (declarationError) { - self.it('encountered a declaration exception', function() { - throw declarationError; - }); - } - - currentDeclarationSuite = parentSuite; - } - - function findFocusedAncestor(suite) { - while (suite) { - if (suite.isFocused) { - return suite.id; - } - suite = suite.parentSuite; - } - - return null; - } - - function unfocusAncestor() { - var focusedAncestor = findFocusedAncestor(currentDeclarationSuite); - if (focusedAncestor) { - for (var i = 0; i < focusedRunnables.length; i++) { - if (focusedRunnables[i] === focusedAncestor) { - focusedRunnables.splice(i, 1); - break; - } - } - } - } - - var runnablesExplictlySet = false; - - var runnablesExplictlySetGetter = function(){ - return runnablesExplictlySet; - }; - - var specFactory = function(description, fn, suite, timeout) { - totalSpecsDefined++; - var spec = new j$.Spec({ - id: getNextSpecId(), - beforeAndAfterFns: beforeAndAfterFns(suite, runnablesExplictlySetGetter), - expectationFactory: expectationFactory, - resultCallback: specResultCallback, - getSpecName: function(spec) { - return getSpecName(spec, suite); - }, - onStart: specStarted, - description: description, - expectationResultFactory: expectationResultFactory, - queueRunnerFactory: queueRunnerFactory, - userContext: function() { return suite.clonedSharedUserContext(); }, - queueableFn: { - fn: fn, - timeout: function() { return timeout || j$.DEFAULT_TIMEOUT_INTERVAL; } - } - }); - - runnableLookupTable[spec.id] = spec; - - if (!self.specFilter(spec)) { - spec.disable(); - } - - return spec; - - function specResultCallback(result) { - clearResourcesForRunnable(spec.id); - currentSpec = null; - reporter.specDone(result); - } - - function specStarted(spec) { - currentSpec = spec; - defaultResourcesForRunnable(spec.id, suite.id); - reporter.specStarted(spec.result); - } - }; - - this.it = function(description, fn, timeout) { - var spec = specFactory(description, fn, currentDeclarationSuite, timeout); - currentDeclarationSuite.addChild(spec); - return spec; - }; - - this.xit = function() { - var spec = this.it.apply(this, arguments); - spec.pend(); - return spec; - }; - - this.fit = function(){ - var spec = this.it.apply(this, arguments); - - focusedRunnables.push(spec.id); - unfocusAncestor(); - return spec; - }; - - this.expect = function(actual) { - if (!currentRunnable()) { - throw new Error('\'expect\' was used when there was no current spec, this could be because an asynchronous test timed out'); - } - - return currentRunnable().expect(actual); - }; - - this.beforeEach = function(beforeEachFunction, timeout) { - currentDeclarationSuite.beforeEach({ - fn: beforeEachFunction, - timeout: function() { return timeout || j$.DEFAULT_TIMEOUT_INTERVAL; } - }); - }; - - this.beforeAll = function(beforeAllFunction, timeout) { - currentDeclarationSuite.beforeAll({ - fn: beforeAllFunction, - timeout: function() { return timeout || j$.DEFAULT_TIMEOUT_INTERVAL; } - }); - }; - - this.afterEach = function(afterEachFunction, timeout) { - currentDeclarationSuite.afterEach({ - fn: afterEachFunction, - timeout: function() { return timeout || j$.DEFAULT_TIMEOUT_INTERVAL; } - }); - }; - - this.afterAll = function(afterAllFunction, timeout) { - currentDeclarationSuite.afterAll({ - fn: afterAllFunction, - timeout: function() { return timeout || j$.DEFAULT_TIMEOUT_INTERVAL; } - }); - }; - - this.pending = function() { - throw j$.Spec.pendingSpecExceptionMessage; - }; - - this.fail = function(error) { - var message = 'Failed'; - if (error) { - message += ': '; - message += error.message || error; - } - - currentRunnable().addExpectationResult(false, { - matcherName: '', - passed: false, - expected: '', - actual: '', - message: message - }); - }; - } - - return Env; -}; - -getJasmineRequireObj().JsApiReporter = function() { - - var noopTimer = { - start: function(){}, - elapsed: function(){ return 0; } - }; - - function JsApiReporter(options) { - var timer = options.timer || noopTimer, - status = 'loaded'; - - this.started = false; - this.finished = false; - - this.jasmineStarted = function() { - this.started = true; - status = 'started'; - timer.start(); - }; - - var executionTime; - - this.jasmineDone = function() { - this.finished = true; - executionTime = timer.elapsed(); - status = 'done'; - }; - - this.status = function() { - return status; - }; - - var suites = [], - suites_hash = {}; - - this.suiteStarted = function(result) { - suites_hash[result.id] = result; - }; - - this.suiteDone = function(result) { - storeSuite(result); - }; - - this.suiteResults = function(index, length) { - return suites.slice(index, index + length); - }; - - function storeSuite(result) { - suites.push(result); - suites_hash[result.id] = result; - } - - this.suites = function() { - return suites_hash; - }; - - var specs = []; - - this.specDone = function(result) { - specs.push(result); - }; - - this.specResults = function(index, length) { - return specs.slice(index, index + length); - }; - - this.specs = function() { - return specs; - }; - - this.executionTime = function() { - return executionTime; - }; - - } - - return JsApiReporter; -}; - -getJasmineRequireObj().Any = function() { - - function Any(expectedObject) { - this.expectedObject = expectedObject; - } - - Any.prototype.jasmineMatches = function(other) { - if (this.expectedObject == String) { - return typeof other == 'string' || other instanceof String; - } - - if (this.expectedObject == Number) { - return typeof other == 'number' || other instanceof Number; - } - - if (this.expectedObject == Function) { - return typeof other == 'function' || other instanceof Function; - } - - if (this.expectedObject == Object) { - return typeof other == 'object'; - } - - if (this.expectedObject == Boolean) { - return typeof other == 'boolean'; - } - - return other instanceof this.expectedObject; - }; - - Any.prototype.jasmineToString = function() { - return ''; - }; - - return Any; -}; - -getJasmineRequireObj().CallTracker = function() { - - function CallTracker() { - var calls = []; - - this.track = function(context) { - calls.push(context); - }; - - this.any = function() { - return !!calls.length; - }; - - this.count = function() { - return calls.length; - }; - - this.argsFor = function(index) { - var call = calls[index]; - return call ? call.args : []; - }; - - this.all = function() { - return calls; - }; - - this.allArgs = function() { - var callArgs = []; - for(var i = 0; i < calls.length; i++){ - callArgs.push(calls[i].args); - } - - return callArgs; - }; - - this.first = function() { - return calls[0]; - }; - - this.mostRecent = function() { - return calls[calls.length - 1]; - }; - - this.reset = function() { - calls = []; - }; - } - - return CallTracker; -}; - -getJasmineRequireObj().Clock = function() { - function Clock(global, delayedFunctionScheduler, mockDate) { - var self = this, - realTimingFunctions = { - setTimeout: global.setTimeout, - clearTimeout: global.clearTimeout, - setInterval: global.setInterval, - clearInterval: global.clearInterval - }, - fakeTimingFunctions = { - setTimeout: setTimeout, - clearTimeout: clearTimeout, - setInterval: setInterval, - clearInterval: clearInterval - }, - installed = false, - timer; - - - self.install = function() { - replace(global, fakeTimingFunctions); - timer = fakeTimingFunctions; - installed = true; - - return self; - }; - - self.uninstall = function() { - delayedFunctionScheduler.reset(); - mockDate.uninstall(); - replace(global, realTimingFunctions); - - timer = realTimingFunctions; - installed = false; - }; - - self.mockDate = function(initialDate) { - mockDate.install(initialDate); - }; - - self.setTimeout = function(fn, delay, params) { - if (legacyIE()) { - if (arguments.length > 2) { - throw new Error('IE < 9 cannot support extra params to setTimeout without a polyfill'); - } - return timer.setTimeout(fn, delay); - } - return Function.prototype.apply.apply(timer.setTimeout, [global, arguments]); - }; - - self.setInterval = function(fn, delay, params) { - if (legacyIE()) { - if (arguments.length > 2) { - throw new Error('IE < 9 cannot support extra params to setInterval without a polyfill'); - } - return timer.setInterval(fn, delay); - } - return Function.prototype.apply.apply(timer.setInterval, [global, arguments]); - }; - - self.clearTimeout = function(id) { - return Function.prototype.call.apply(timer.clearTimeout, [global, id]); - }; - - self.clearInterval = function(id) { - return Function.prototype.call.apply(timer.clearInterval, [global, id]); - }; - - self.tick = function(millis) { - if (installed) { - mockDate.tick(millis); - delayedFunctionScheduler.tick(millis); - } else { - throw new Error('Mock clock is not installed, use jasmine.clock().install()'); - } - }; - - return self; - - function legacyIE() { - //if these methods are polyfilled, apply will be present - return !(realTimingFunctions.setTimeout || realTimingFunctions.setInterval).apply; - } - - function replace(dest, source) { - for (var prop in source) { - dest[prop] = source[prop]; - } - } - - function setTimeout(fn, delay) { - return delayedFunctionScheduler.scheduleFunction(fn, delay, argSlice(arguments, 2)); - } - - function clearTimeout(id) { - return delayedFunctionScheduler.removeFunctionWithId(id); - } - - function setInterval(fn, interval) { - return delayedFunctionScheduler.scheduleFunction(fn, interval, argSlice(arguments, 2), true); - } - - function clearInterval(id) { - return delayedFunctionScheduler.removeFunctionWithId(id); - } - - function argSlice(argsObj, n) { - return Array.prototype.slice.call(argsObj, n); - } - } - - return Clock; -}; - -getJasmineRequireObj().DelayedFunctionScheduler = function() { - function DelayedFunctionScheduler() { - var self = this; - var scheduledLookup = []; - var scheduledFunctions = {}; - var currentTime = 0; - var delayedFnCount = 0; - - self.tick = function(millis) { - millis = millis || 0; - var endTime = currentTime + millis; - - runScheduledFunctions(endTime); - currentTime = endTime; - }; - - self.scheduleFunction = function(funcToCall, millis, params, recurring, timeoutKey, runAtMillis) { - var f; - if (typeof(funcToCall) === 'string') { - /* jshint evil: true */ - f = function() { return eval(funcToCall); }; - /* jshint evil: false */ - } else { - f = funcToCall; - } - - millis = millis || 0; - timeoutKey = timeoutKey || ++delayedFnCount; - runAtMillis = runAtMillis || (currentTime + millis); - - var funcToSchedule = { - runAtMillis: runAtMillis, - funcToCall: f, - recurring: recurring, - params: params, - timeoutKey: timeoutKey, - millis: millis - }; - - if (runAtMillis in scheduledFunctions) { - scheduledFunctions[runAtMillis].push(funcToSchedule); - } else { - scheduledFunctions[runAtMillis] = [funcToSchedule]; - scheduledLookup.push(runAtMillis); - scheduledLookup.sort(function (a, b) { - return a - b; - }); - } - - return timeoutKey; - }; - - self.removeFunctionWithId = function(timeoutKey) { - for (var runAtMillis in scheduledFunctions) { - var funcs = scheduledFunctions[runAtMillis]; - var i = indexOfFirstToPass(funcs, function (func) { - return func.timeoutKey === timeoutKey; - }); - - if (i > -1) { - if (funcs.length === 1) { - delete scheduledFunctions[runAtMillis]; - deleteFromLookup(runAtMillis); - } else { - funcs.splice(i, 1); - } - - // intervals get rescheduled when executed, so there's never more - // than a single scheduled function with a given timeoutKey - break; - } - } - }; - - self.reset = function() { - currentTime = 0; - scheduledLookup = []; - scheduledFunctions = {}; - delayedFnCount = 0; - }; - - return self; - - function indexOfFirstToPass(array, testFn) { - var index = -1; - - for (var i = 0; i < array.length; ++i) { - if (testFn(array[i])) { - index = i; - break; - } - } - - return index; - } - - function deleteFromLookup(key) { - var value = Number(key); - var i = indexOfFirstToPass(scheduledLookup, function (millis) { - return millis === value; - }); - - if (i > -1) { - scheduledLookup.splice(i, 1); - } - } - - function reschedule(scheduledFn) { - self.scheduleFunction(scheduledFn.funcToCall, - scheduledFn.millis, - scheduledFn.params, - true, - scheduledFn.timeoutKey, - scheduledFn.runAtMillis + scheduledFn.millis); - } - - function runScheduledFunctions(endTime) { - if (scheduledLookup.length === 0 || scheduledLookup[0] > endTime) { - return; - } - - do { - currentTime = scheduledLookup.shift(); - - var funcsToRun = scheduledFunctions[currentTime]; - delete scheduledFunctions[currentTime]; - - for (var i = 0; i < funcsToRun.length; ++i) { - var funcToRun = funcsToRun[i]; - - if (funcToRun.recurring) { - reschedule(funcToRun); - } - - funcToRun.funcToCall.apply(null, funcToRun.params || []); - } - } while (scheduledLookup.length > 0 && - // checking first if we're out of time prevents setTimeout(0) - // scheduled in a funcToRun from forcing an extra iteration - currentTime !== endTime && - scheduledLookup[0] <= endTime); - } - } - - return DelayedFunctionScheduler; -}; - -getJasmineRequireObj().ExceptionFormatter = function() { - function ExceptionFormatter() { - this.message = function(error) { - var message = ''; - - if (error.name && error.message) { - message += error.name + ': ' + error.message; - } else { - message += error.toString() + ' thrown'; - } - - if (error.fileName || error.sourceURL) { - message += ' in ' + (error.fileName || error.sourceURL); - } - - if (error.line || error.lineNumber) { - message += ' (line ' + (error.line || error.lineNumber) + ')'; - } - - return message; - }; - - this.stack = function(error) { - return error ? error.stack : null; - }; - } - - return ExceptionFormatter; -}; - -getJasmineRequireObj().Expectation = function() { - - function Expectation(options) { - this.util = options.util || { buildFailureMessage: function() {} }; - this.customEqualityTesters = options.customEqualityTesters || []; - this.actual = options.actual; - this.addExpectationResult = options.addExpectationResult || function(){}; - this.isNot = options.isNot; - - var customMatchers = options.customMatchers || {}; - for (var matcherName in customMatchers) { - this[matcherName] = Expectation.prototype.wrapCompare(matcherName, customMatchers[matcherName]); - } - } - - Expectation.prototype.wrapCompare = function(name, matcherFactory) { - return function() { - var args = Array.prototype.slice.call(arguments, 0), - expected = args.slice(0), - message = ''; - - args.unshift(this.actual); - - var matcher = matcherFactory(this.util, this.customEqualityTesters), - matcherCompare = matcher.compare; - - function defaultNegativeCompare() { - var result = matcher.compare.apply(null, args); - result.pass = !result.pass; - return result; - } - - if (this.isNot) { - matcherCompare = matcher.negativeCompare || defaultNegativeCompare; - } - - var result = matcherCompare.apply(null, args); - - if (!result.pass) { - if (!result.message) { - args.unshift(this.isNot); - args.unshift(name); - message = this.util.buildFailureMessage.apply(null, args); - } else { - if (Object.prototype.toString.apply(result.message) === '[object Function]') { - message = result.message(); - } else { - message = result.message; - } - } - } - - if (expected.length == 1) { - expected = expected[0]; - } - - // TODO: how many of these params are needed? - this.addExpectationResult( - result.pass, - { - matcherName: name, - passed: result.pass, - message: message, - actual: this.actual, - expected: expected // TODO: this may need to be arrayified/sliced - } - ); - }; - }; - - Expectation.addCoreMatchers = function(matchers) { - var prototype = Expectation.prototype; - for (var matcherName in matchers) { - var matcher = matchers[matcherName]; - prototype[matcherName] = prototype.wrapCompare(matcherName, matcher); - } - }; - - Expectation.Factory = function(options) { - options = options || {}; - - var expect = new Expectation(options); - - // TODO: this would be nice as its own Object - NegativeExpectation - // TODO: copy instead of mutate options - options.isNot = true; - expect.not = new Expectation(options); - - return expect; - }; - - return Expectation; -}; - -//TODO: expectation result may make more sense as a presentation of an expectation. -getJasmineRequireObj().buildExpectationResult = function() { - function buildExpectationResult(options) { - var messageFormatter = options.messageFormatter || function() {}, - stackFormatter = options.stackFormatter || function() {}; - - var result = { - matcherName: options.matcherName, - message: message(), - stack: stack(), - passed: options.passed - }; - - if(!result.passed) { - result.expected = options.expected; - result.actual = options.actual; - } - - return result; - - function message() { - if (options.passed) { - return 'Passed.'; - } else if (options.message) { - return options.message; - } else if (options.error) { - return messageFormatter(options.error); - } - return ''; - } - - function stack() { - if (options.passed) { - return ''; - } - - var error = options.error; - if (!error) { - try { - throw new Error(message()); - } catch (e) { - error = e; - } - } - return stackFormatter(error); - } - } - - return buildExpectationResult; -}; - -getJasmineRequireObj().MockDate = function() { - function MockDate(global) { - var self = this; - var currentTime = 0; - - if (!global || !global.Date) { - self.install = function() {}; - self.tick = function() {}; - self.uninstall = function() {}; - return self; - } - - var GlobalDate = global.Date; - - self.install = function(mockDate) { - if (mockDate instanceof GlobalDate) { - currentTime = mockDate.getTime(); - } else { - currentTime = new GlobalDate().getTime(); - } - - global.Date = FakeDate; - }; - - self.tick = function(millis) { - millis = millis || 0; - currentTime = currentTime + millis; - }; - - self.uninstall = function() { - currentTime = 0; - global.Date = GlobalDate; - }; - - createDateProperties(); - - return self; - - function FakeDate() { - switch(arguments.length) { - case 0: - return new GlobalDate(currentTime); - case 1: - return new GlobalDate(arguments[0]); - case 2: - return new GlobalDate(arguments[0], arguments[1]); - case 3: - return new GlobalDate(arguments[0], arguments[1], arguments[2]); - case 4: - return new GlobalDate(arguments[0], arguments[1], arguments[2], arguments[3]); - case 5: - return new GlobalDate(arguments[0], arguments[1], arguments[2], arguments[3], - arguments[4]); - case 6: - return new GlobalDate(arguments[0], arguments[1], arguments[2], arguments[3], - arguments[4], arguments[5]); - case 7: - return new GlobalDate(arguments[0], arguments[1], arguments[2], arguments[3], - arguments[4], arguments[5], arguments[6]); - } - } - - function createDateProperties() { - FakeDate.prototype = GlobalDate.prototype; - - FakeDate.now = function() { - if (GlobalDate.now) { - return currentTime; - } else { - throw new Error('Browser does not support Date.now()'); - } - }; - - FakeDate.toSource = GlobalDate.toSource; - FakeDate.toString = GlobalDate.toString; - FakeDate.parse = GlobalDate.parse; - FakeDate.UTC = GlobalDate.UTC; - } - } - - return MockDate; -}; - -getJasmineRequireObj().ObjectContaining = function(j$) { - - function ObjectContaining(sample) { - this.sample = sample; - } - - ObjectContaining.prototype.jasmineMatches = function(other, mismatchKeys, mismatchValues) { - if (typeof(this.sample) !== 'object') { throw new Error('You must provide an object to objectContaining, not \''+this.sample+'\'.'); } - - mismatchKeys = mismatchKeys || []; - mismatchValues = mismatchValues || []; - - var hasKey = function(obj, keyName) { - return obj !== null && !j$.util.isUndefined(obj[keyName]); - }; - - for (var property in this.sample) { - if (!hasKey(other, property) && hasKey(this.sample, property)) { - mismatchKeys.push('expected has key \'' + property + '\', but missing from actual.'); - } - else if (!j$.matchersUtil.equals(other[property], this.sample[property])) { - mismatchValues.push('\'' + property + '\' was \'' + (other[property] ? j$.util.htmlEscape(other[property].toString()) : other[property]) + '\' in actual, but was \'' + (this.sample[property] ? j$.util.htmlEscape(this.sample[property].toString()) : this.sample[property]) + '\' in expected.'); - } - } - - return (mismatchKeys.length === 0 && mismatchValues.length === 0); - }; - - ObjectContaining.prototype.jasmineToString = function() { - return ''; - }; - - return ObjectContaining; -}; - -getJasmineRequireObj().pp = function(j$) { - - function PrettyPrinter() { - this.ppNestLevel_ = 0; - this.seen = []; - } - - PrettyPrinter.prototype.format = function(value) { - this.ppNestLevel_++; - try { - if (j$.util.isUndefined(value)) { - this.emitScalar('undefined'); - } else if (value === null) { - this.emitScalar('null'); - } else if (value === 0 && 1/value === -Infinity) { - this.emitScalar('-0'); - } else if (value === j$.getGlobal()) { - this.emitScalar(''); - } else if (value.jasmineToString) { - this.emitScalar(value.jasmineToString()); - } else if (typeof value === 'string') { - this.emitString(value); - } else if (j$.isSpy(value)) { - this.emitScalar('spy on ' + value.and.identity()); - } else if (value instanceof RegExp) { - this.emitScalar(value.toString()); - } else if (typeof value === 'function') { - this.emitScalar('Function'); - } else if (typeof value.nodeType === 'number') { - this.emitScalar('HTMLNode'); - } else if (value instanceof Date) { - this.emitScalar('Date(' + value + ')'); - } else if (j$.util.arrayContains(this.seen, value)) { - this.emitScalar(''); - } else if (j$.isArray_(value) || j$.isA_('Object', value)) { - this.seen.push(value); - if (j$.isArray_(value)) { - this.emitArray(value); - } else { - this.emitObject(value); - } - this.seen.pop(); - } else { - this.emitScalar(value.toString()); - } - } finally { - this.ppNestLevel_--; - } - }; - - PrettyPrinter.prototype.iterateObject = function(obj, fn) { - for (var property in obj) { - if (!Object.prototype.hasOwnProperty.call(obj, property)) { continue; } - fn(property, obj.__lookupGetter__ ? (!j$.util.isUndefined(obj.__lookupGetter__(property)) && - obj.__lookupGetter__(property) !== null) : false); - } - }; - - PrettyPrinter.prototype.emitArray = j$.unimplementedMethod_; - PrettyPrinter.prototype.emitObject = j$.unimplementedMethod_; - PrettyPrinter.prototype.emitScalar = j$.unimplementedMethod_; - PrettyPrinter.prototype.emitString = j$.unimplementedMethod_; - - function StringPrettyPrinter() { - PrettyPrinter.call(this); - - this.string = ''; - } - - j$.util.inherit(StringPrettyPrinter, PrettyPrinter); - - StringPrettyPrinter.prototype.emitScalar = function(value) { - this.append(value); - }; - - StringPrettyPrinter.prototype.emitString = function(value) { - this.append('\'' + value + '\''); - }; - - StringPrettyPrinter.prototype.emitArray = function(array) { - if (this.ppNestLevel_ > j$.MAX_PRETTY_PRINT_DEPTH) { - this.append('Array'); - return; - } - var length = Math.min(array.length, j$.MAX_PRETTY_PRINT_ARRAY_LENGTH); - this.append('[ '); - for (var i = 0; i < length; i++) { - if (i > 0) { - this.append(', '); - } - this.format(array[i]); - } - if(array.length > length){ - this.append(', ...'); - } - this.append(' ]'); - }; - - StringPrettyPrinter.prototype.emitObject = function(obj) { - if (this.ppNestLevel_ > j$.MAX_PRETTY_PRINT_DEPTH) { - this.append('Object'); - return; - } - - var self = this; - this.append('{ '); - var first = true; - - this.iterateObject(obj, function(property, isGetter) { - if (first) { - first = false; - } else { - self.append(', '); - } - - self.append(property); - self.append(': '); - if (isGetter) { - self.append(''); - } else { - self.format(obj[property]); - } - }); - - this.append(' }'); - }; - - StringPrettyPrinter.prototype.append = function(value) { - this.string += value; - }; - - return function(value) { - var stringPrettyPrinter = new StringPrettyPrinter(); - stringPrettyPrinter.format(value); - return stringPrettyPrinter.string; - }; -}; - -getJasmineRequireObj().QueueRunner = function(j$) { - - function once(fn) { - var called = false; - return function() { - if (!called) { - called = true; - fn(); - } - }; - } - - function QueueRunner(attrs) { - this.queueableFns = attrs.queueableFns || []; - this.onComplete = attrs.onComplete || function() {}; - this.clearStack = attrs.clearStack || function(fn) {fn();}; - this.onException = attrs.onException || function() {}; - this.catchException = attrs.catchException || function() { return true; }; - this.userContext = attrs.userContext || {}; - this.timer = attrs.timeout || {setTimeout: setTimeout, clearTimeout: clearTimeout}; - this.fail = attrs.fail || function() {}; - } - - QueueRunner.prototype.execute = function() { - this.run(this.queueableFns, 0); - }; - - QueueRunner.prototype.run = function(queueableFns, recursiveIndex) { - var length = queueableFns.length, - self = this, - iterativeIndex; - - - for(iterativeIndex = recursiveIndex; iterativeIndex < length; iterativeIndex++) { - var queueableFn = queueableFns[iterativeIndex]; - if (queueableFn.fn.length > 0) { - return attemptAsync(queueableFn); - } else { - attemptSync(queueableFn); - } - } - - var runnerDone = iterativeIndex >= length; - - if (runnerDone) { - this.clearStack(this.onComplete); - } - - function attemptSync(queueableFn) { - try { - queueableFn.fn.call(self.userContext); - } catch (e) { - handleException(e, queueableFn); - } - } - - function attemptAsync(queueableFn) { - var clearTimeout = function () { - Function.prototype.apply.apply(self.timer.clearTimeout, [j$.getGlobal(), [timeoutId]]); - }, - next = once(function () { - clearTimeout(timeoutId); - self.run(queueableFns, iterativeIndex + 1); - }), - timeoutId; - - next.fail = function() { - self.fail.apply(null, arguments); - next(); - }; - - if (queueableFn.timeout) { - timeoutId = Function.prototype.apply.apply(self.timer.setTimeout, [j$.getGlobal(), [function() { - var error = new Error('Timeout - Async callback was not invoked within timeout specified by jasmine.DEFAULT_TIMEOUT_INTERVAL.'); - onException(error, queueableFn); - next(); - }, queueableFn.timeout()]]); - } - - try { - queueableFn.fn.call(self.userContext, next); - } catch (e) { - handleException(e, queueableFn); - next(); - } - } - - function onException(e, queueableFn) { - self.onException(e); - } - - function handleException(e, queueableFn) { - onException(e, queueableFn); - if (!self.catchException(e)) { - //TODO: set a var when we catch an exception and - //use a finally block to close the loop in a nice way.. - throw e; - } - } - }; - - return QueueRunner; -}; - -getJasmineRequireObj().ReportDispatcher = function() { - function ReportDispatcher(methods) { - - var dispatchedMethods = methods || []; - - for (var i = 0; i < dispatchedMethods.length; i++) { - var method = dispatchedMethods[i]; - this[method] = (function(m) { - return function() { - dispatch(m, arguments); - }; - }(method)); - } - - var reporters = []; - - this.addReporter = function(reporter) { - reporters.push(reporter); - }; - - return this; - - function dispatch(method, args) { - for (var i = 0; i < reporters.length; i++) { - var reporter = reporters[i]; - if (reporter[method]) { - reporter[method].apply(reporter, args); - } - } - } - } - - return ReportDispatcher; -}; - - -getJasmineRequireObj().SpyRegistry = function(j$) { - - function SpyRegistry(options) { - options = options || {}; - var currentSpies = options.currentSpies || function() { return []; }; - - this.spyOn = function(obj, methodName) { - if (j$.util.isUndefined(obj)) { - throw new Error('spyOn could not find an object to spy upon for ' + methodName + '()'); - } - - if (j$.util.isUndefined(obj[methodName])) { - throw new Error(methodName + '() method does not exist'); - } - - if (obj[methodName] && j$.isSpy(obj[methodName])) { - //TODO?: should this return the current spy? Downside: may cause user confusion about spy state - throw new Error(methodName + ' has already been spied upon'); - } - - var spy = j$.createSpy(methodName, obj[methodName]); - - currentSpies().push({ - spy: spy, - baseObj: obj, - methodName: methodName, - originalValue: obj[methodName] - }); - - obj[methodName] = spy; - - return spy; - }; - - this.clearSpies = function() { - var spies = currentSpies(); - for (var i = 0; i < spies.length; i++) { - var spyEntry = spies[i]; - spyEntry.baseObj[spyEntry.methodName] = spyEntry.originalValue; - } - }; - } - - return SpyRegistry; -}; - -getJasmineRequireObj().SpyStrategy = function() { - - function SpyStrategy(options) { - options = options || {}; - - var identity = options.name || 'unknown', - originalFn = options.fn || function() {}, - getSpy = options.getSpy || function() {}, - plan = function() {}; - - this.identity = function() { - return identity; - }; - - this.exec = function() { - return plan.apply(this, arguments); - }; - - this.callThrough = function() { - plan = originalFn; - return getSpy(); - }; - - this.returnValue = function(value) { - plan = function() { - return value; - }; - return getSpy(); - }; - - this.returnValues = function() { - var values = Array.prototype.slice.call(arguments); - plan = function () { - return values.shift(); - }; - return getSpy(); - }; - - this.throwError = function(something) { - var error = (something instanceof Error) ? something : new Error(something); - plan = function() { - throw error; - }; - return getSpy(); - }; - - this.callFake = function(fn) { - plan = fn; - return getSpy(); - }; - - this.stub = function(fn) { - plan = function() {}; - return getSpy(); - }; - } - - return SpyStrategy; -}; - -getJasmineRequireObj().Suite = function() { - function Suite(attrs) { - this.env = attrs.env; - this.id = attrs.id; - this.parentSuite = attrs.parentSuite; - this.description = attrs.description; - this.onStart = attrs.onStart || function() {}; - this.resultCallback = attrs.resultCallback || function() {}; - this.clearStack = attrs.clearStack || function(fn) {fn();}; - this.expectationFactory = attrs.expectationFactory; - this.expectationResultFactory = attrs.expectationResultFactory; - - this.beforeFns = []; - this.afterFns = []; - this.beforeAllFns = []; - this.afterAllFns = []; - this.queueRunner = attrs.queueRunner || function() {}; - this.disabled = false; - - this.children = []; - - this.result = { - id: this.id, - description: this.description, - fullName: this.getFullName(), - failedExpectations: [] - }; - } - - Suite.prototype.expect = function(actual) { - return this.expectationFactory(actual, this); - }; - - Suite.prototype.getFullName = function() { - var fullName = this.description; - for (var parentSuite = this.parentSuite; parentSuite; parentSuite = parentSuite.parentSuite) { - if (parentSuite.parentSuite) { - fullName = parentSuite.description + ' ' + fullName; - } - } - return fullName; - }; - - Suite.prototype.disable = function() { - this.disabled = true; - }; - - Suite.prototype.beforeEach = function(fn) { - this.beforeFns.unshift(fn); - }; - - Suite.prototype.beforeAll = function(fn) { - this.beforeAllFns.push(fn); - }; - - Suite.prototype.afterEach = function(fn) { - this.afterFns.unshift(fn); - }; - - Suite.prototype.afterAll = function(fn) { - this.afterAllFns.push(fn); - }; - - Suite.prototype.addChild = function(child) { - this.children.push(child); - }; - - Suite.prototype.status = function() { - if (this.disabled) { - return 'disabled'; - } - - if (this.result.failedExpectations.length > 0) { - return 'failed'; - } else { - return 'finished'; - } - }; - - Suite.prototype.execute = function(onComplete) { - var self = this; - - this.onStart(this); - - if (this.disabled) { - complete(); - return; - } - - var allFns = []; - - for (var i = 0; i < this.children.length; i++) { - allFns.push(wrapChildAsAsync(this.children[i])); - } - - if (this.isExecutable()) { - allFns = this.beforeAllFns.concat(allFns); - allFns = allFns.concat(this.afterAllFns); - } - - this.queueRunner({ - queueableFns: allFns, - onComplete: complete, - userContext: this.sharedUserContext(), - onException: function() { self.onException.apply(self, arguments); } - }); - - function complete() { - self.result.status = self.status(); - self.resultCallback(self.result); - - if (onComplete) { - onComplete(); - } - } - - function wrapChildAsAsync(child) { - return { fn: function(done) { child.execute(done); } }; - } - }; - - Suite.prototype.isExecutable = function() { - var foundActive = false; - for(var i = 0; i < this.children.length; i++) { - if(this.children[i].isExecutable()) { - foundActive = true; - break; - } - } - return foundActive; - }; - - Suite.prototype.sharedUserContext = function() { - if (!this.sharedContext) { - this.sharedContext = this.parentSuite ? clone(this.parentSuite.sharedUserContext()) : {}; - } - - return this.sharedContext; - }; - - Suite.prototype.clonedSharedUserContext = function() { - return clone(this.sharedUserContext()); - }; - - Suite.prototype.onException = function() { - if(isAfterAll(this.children)) { - var data = { - matcherName: '', - passed: false, - expected: '', - actual: '', - error: arguments[0] - }; - this.result.failedExpectations.push(this.expectationResultFactory(data)); - } else { - for (var i = 0; i < this.children.length; i++) { - var child = this.children[i]; - child.onException.apply(child, arguments); - } - } - }; - - Suite.prototype.addExpectationResult = function () { - if(isAfterAll(this.children) && isFailure(arguments)){ - var data = arguments[1]; - this.result.failedExpectations.push(this.expectationResultFactory(data)); - } else { - for (var i = 0; i < this.children.length; i++) { - var child = this.children[i]; - child.addExpectationResult.apply(child, arguments); - } - } - }; - - function isAfterAll(children) { - return children && children[0].result.status; - } - - function isFailure(args) { - return !args[0]; - } - - function clone(obj) { - var clonedObj = {}; - for (var prop in obj) { - if (obj.hasOwnProperty(prop)) { - clonedObj[prop] = obj[prop]; - } - } - - return clonedObj; - } - - return Suite; -}; - -if (typeof window == void 0 && typeof exports == 'object') { - exports.Suite = jasmineRequire.Suite; -} - -getJasmineRequireObj().Timer = function() { - var defaultNow = (function(Date) { - return function() { return new Date().getTime(); }; - })(Date); - - function Timer(options) { - options = options || {}; - - var now = options.now || defaultNow, - startTime; - - this.start = function() { - startTime = now(); - }; - - this.elapsed = function() { - return now() - startTime; - }; - } - - return Timer; -}; - -getJasmineRequireObj().matchersUtil = function(j$) { - // TODO: what to do about jasmine.pp not being inject? move to JSON.stringify? gut PrettyPrinter? - - return { - equals: function(a, b, customTesters) { - customTesters = customTesters || []; - - return eq(a, b, [], [], customTesters); - }, - - contains: function(haystack, needle, customTesters) { - customTesters = customTesters || []; - - if ((Object.prototype.toString.apply(haystack) === '[object Array]') || - (!!haystack && !haystack.indexOf)) - { - for (var i = 0; i < haystack.length; i++) { - if (eq(haystack[i], needle, [], [], customTesters)) { - return true; - } - } - return false; - } - - return !!haystack && haystack.indexOf(needle) >= 0; - }, - - buildFailureMessage: function() { - var args = Array.prototype.slice.call(arguments, 0), - matcherName = args[0], - isNot = args[1], - actual = args[2], - expected = args.slice(3), - englishyPredicate = matcherName.replace(/[A-Z]/g, function(s) { return ' ' + s.toLowerCase(); }); - - var message = 'Expected ' + - j$.pp(actual) + - (isNot ? ' not ' : ' ') + - englishyPredicate; - - if (expected.length > 0) { - for (var i = 0; i < expected.length; i++) { - if (i > 0) { - message += ','; - } - message += ' ' + j$.pp(expected[i]); - } - } - - return message + '.'; - } - }; - - // Equality function lovingly adapted from isEqual in - // [Underscore](http://underscorejs.org) - function eq(a, b, aStack, bStack, customTesters) { - var result = true; - - for (var i = 0; i < customTesters.length; i++) { - var customTesterResult = customTesters[i](a, b); - if (!j$.util.isUndefined(customTesterResult)) { - return customTesterResult; - } - } - - if (a instanceof j$.Any) { - result = a.jasmineMatches(b); - if (result) { - return true; - } - } - - if (b instanceof j$.Any) { - result = b.jasmineMatches(a); - if (result) { - return true; - } - } - - if (b instanceof j$.ObjectContaining) { - result = b.jasmineMatches(a); - if (result) { - return true; - } - } - - if (a instanceof Error && b instanceof Error) { - return a.message == b.message; - } - - // Identical objects are equal. `0 === -0`, but they aren't identical. - // See the [Harmony `egal` proposal](http://wiki.ecmascript.org/doku.php?id=harmony:egal). - if (a === b) { return a !== 0 || 1 / a == 1 / b; } - // A strict comparison is necessary because `null == undefined`. - if (a === null || b === null) { return a === b; } - var className = Object.prototype.toString.call(a); - if (className != Object.prototype.toString.call(b)) { return false; } - switch (className) { - // Strings, numbers, dates, and booleans are compared by value. - case '[object String]': - // Primitives and their corresponding object wrappers are equivalent; thus, `"5"` is - // equivalent to `new String("5")`. - return a == String(b); - case '[object Number]': - // `NaN`s are equivalent, but non-reflexive. An `egal` comparison is performed for - // other numeric values. - return a != +a ? b != +b : (a === 0 ? 1 / a == 1 / b : a == +b); - case '[object Date]': - case '[object Boolean]': - // Coerce dates and booleans to numeric primitive values. Dates are compared by their - // millisecond representations. Note that invalid dates with millisecond representations - // of `NaN` are not equivalent. - return +a == +b; - // RegExps are compared by their source patterns and flags. - case '[object RegExp]': - return a.source == b.source && - a.global == b.global && - a.multiline == b.multiline && - a.ignoreCase == b.ignoreCase; - } - if (typeof a != 'object' || typeof b != 'object') { return false; } - // Assume equality for cyclic structures. The algorithm for detecting cyclic - // structures is adapted from ES 5.1 section 15.12.3, abstract operation `JO`. - var length = aStack.length; - while (length--) { - // Linear search. Performance is inversely proportional to the number of - // unique nested structures. - if (aStack[length] == a) { return bStack[length] == b; } - } - // Add the first object to the stack of traversed objects. - aStack.push(a); - bStack.push(b); - var size = 0; - // Recursively compare objects and arrays. - if (className == '[object Array]') { - // Compare array lengths to determine if a deep comparison is necessary. - size = a.length; - result = size == b.length; - if (result) { - // Deep compare the contents, ignoring non-numeric properties. - while (size--) { - if (!(result = eq(a[size], b[size], aStack, bStack, customTesters))) { break; } - } - } - } else { - // Objects with different constructors are not equivalent, but `Object`s - // from different frames are. - var aCtor = a.constructor, bCtor = b.constructor; - if (aCtor !== bCtor && !(isFunction(aCtor) && (aCtor instanceof aCtor) && - isFunction(bCtor) && (bCtor instanceof bCtor))) { - return false; - } - // Deep compare objects. - for (var key in a) { - if (has(a, key)) { - // Count the expected number of properties. - size++; - // Deep compare each member. - if (!(result = has(b, key) && eq(a[key], b[key], aStack, bStack, customTesters))) { break; } - } - } - // Ensure that both objects contain the same number of properties. - if (result) { - for (key in b) { - if (has(b, key) && !(size--)) { break; } - } - result = !size; - } - } - // Remove the first object from the stack of traversed objects. - aStack.pop(); - bStack.pop(); - - return result; - - function has(obj, key) { - return obj.hasOwnProperty(key); - } - - function isFunction(obj) { - return typeof obj === 'function'; - } - } -}; - -getJasmineRequireObj().toBe = function() { - function toBe() { - return { - compare: function(actual, expected) { - return { - pass: actual === expected - }; - } - }; - } - - return toBe; -}; - -getJasmineRequireObj().toBeCloseTo = function() { - - function toBeCloseTo() { - return { - compare: function(actual, expected, precision) { - if (precision !== 0) { - precision = precision || 2; - } - - return { - pass: Math.abs(expected - actual) < (Math.pow(10, -precision) / 2) - }; - } - }; - } - - return toBeCloseTo; -}; - -getJasmineRequireObj().toBeDefined = function() { - function toBeDefined() { - return { - compare: function(actual) { - return { - pass: (void 0 !== actual) - }; - } - }; - } - - return toBeDefined; -}; - -getJasmineRequireObj().toBeFalsy = function() { - function toBeFalsy() { - return { - compare: function(actual) { - return { - pass: !!!actual - }; - } - }; - } - - return toBeFalsy; -}; - -getJasmineRequireObj().toBeGreaterThan = function() { - - function toBeGreaterThan() { - return { - compare: function(actual, expected) { - return { - pass: actual > expected - }; - } - }; - } - - return toBeGreaterThan; -}; - - -getJasmineRequireObj().toBeLessThan = function() { - function toBeLessThan() { - return { - - compare: function(actual, expected) { - return { - pass: actual < expected - }; - } - }; - } - - return toBeLessThan; -}; -getJasmineRequireObj().toBeNaN = function(j$) { - - function toBeNaN() { - return { - compare: function(actual) { - var result = { - pass: (actual !== actual) - }; - - if (result.pass) { - result.message = 'Expected actual not to be NaN.'; - } else { - result.message = function() { return 'Expected ' + j$.pp(actual) + ' to be NaN.'; }; - } - - return result; - } - }; - } - - return toBeNaN; -}; - -getJasmineRequireObj().toBeNull = function() { - - function toBeNull() { - return { - compare: function(actual) { - return { - pass: actual === null - }; - } - }; - } - - return toBeNull; -}; - -getJasmineRequireObj().toBeTruthy = function() { - - function toBeTruthy() { - return { - compare: function(actual) { - return { - pass: !!actual - }; - } - }; - } - - return toBeTruthy; -}; - -getJasmineRequireObj().toBeUndefined = function() { - - function toBeUndefined() { - return { - compare: function(actual) { - return { - pass: void 0 === actual - }; - } - }; - } - - return toBeUndefined; -}; - -getJasmineRequireObj().toContain = function() { - function toContain(util, customEqualityTesters) { - customEqualityTesters = customEqualityTesters || []; - - return { - compare: function(actual, expected) { - - return { - pass: util.contains(actual, expected, customEqualityTesters) - }; - } - }; - } - - return toContain; -}; - -getJasmineRequireObj().toEqual = function() { - - function toEqual(util, customEqualityTesters) { - customEqualityTesters = customEqualityTesters || []; - - return { - compare: function(actual, expected) { - var result = { - pass: false - }; - - result.pass = util.equals(actual, expected, customEqualityTesters); - - return result; - } - }; - } - - return toEqual; -}; - -getJasmineRequireObj().toHaveBeenCalled = function(j$) { - - function toHaveBeenCalled() { - return { - compare: function(actual) { - var result = {}; - - if (!j$.isSpy(actual)) { - throw new Error('Expected a spy, but got ' + j$.pp(actual) + '.'); - } - - if (arguments.length > 1) { - throw new Error('toHaveBeenCalled does not take arguments, use toHaveBeenCalledWith'); - } - - result.pass = actual.calls.any(); - - result.message = result.pass ? - 'Expected spy ' + actual.and.identity() + ' not to have been called.' : - 'Expected spy ' + actual.and.identity() + ' to have been called.'; - - return result; - } - }; - } - - return toHaveBeenCalled; -}; - -getJasmineRequireObj().toHaveBeenCalledWith = function(j$) { - - function toHaveBeenCalledWith(util, customEqualityTesters) { - return { - compare: function() { - var args = Array.prototype.slice.call(arguments, 0), - actual = args[0], - expectedArgs = args.slice(1), - result = { pass: false }; - - if (!j$.isSpy(actual)) { - throw new Error('Expected a spy, but got ' + j$.pp(actual) + '.'); - } - - if (!actual.calls.any()) { - result.message = function() { return 'Expected spy ' + actual.and.identity() + ' to have been called with ' + j$.pp(expectedArgs) + ' but it was never called.'; }; - return result; - } - - if (util.contains(actual.calls.allArgs(), expectedArgs, customEqualityTesters)) { - result.pass = true; - result.message = function() { return 'Expected spy ' + actual.and.identity() + ' not to have been called with ' + j$.pp(expectedArgs) + ' but it was.'; }; - } else { - result.message = function() { return 'Expected spy ' + actual.and.identity() + ' to have been called with ' + j$.pp(expectedArgs) + ' but actual calls were ' + j$.pp(actual.calls.allArgs()).replace(/^\[ | \]$/g, '') + '.'; }; - } - - return result; - } - }; - } - - return toHaveBeenCalledWith; -}; - -getJasmineRequireObj().toMatch = function() { - - function toMatch() { - return { - compare: function(actual, expected) { - var regexp = new RegExp(expected); - - return { - pass: regexp.test(actual) - }; - } - }; - } - - return toMatch; -}; - -getJasmineRequireObj().toThrow = function(j$) { - - function toThrow(util) { - return { - compare: function(actual, expected) { - var result = { pass: false }, - threw = false, - thrown; - - if (typeof actual != 'function') { - throw new Error('Actual is not a Function'); - } - - try { - actual(); - } catch (e) { - threw = true; - thrown = e; - } - - if (!threw) { - result.message = 'Expected function to throw an exception.'; - return result; - } - - if (arguments.length == 1) { - result.pass = true; - result.message = function() { return 'Expected function not to throw, but it threw ' + j$.pp(thrown) + '.'; }; - - return result; - } - - if (util.equals(thrown, expected)) { - result.pass = true; - result.message = function() { return 'Expected function not to throw ' + j$.pp(expected) + '.'; }; - } else { - result.message = function() { return 'Expected function to throw ' + j$.pp(expected) + ', but it threw ' + j$.pp(thrown) + '.'; }; - } - - return result; - } - }; - } - - return toThrow; -}; - -getJasmineRequireObj().toThrowError = function(j$) { - function toThrowError (util) { - return { - compare: function(actual) { - var threw = false, - pass = {pass: true}, - fail = {pass: false}, - thrown; - - if (typeof actual != 'function') { - throw new Error('Actual is not a Function'); - } - - var errorMatcher = getMatcher.apply(null, arguments); - - try { - actual(); - } catch (e) { - threw = true; - thrown = e; - } - - if (!threw) { - fail.message = 'Expected function to throw an Error.'; - return fail; - } - - if (!(thrown instanceof Error)) { - fail.message = function() { return 'Expected function to throw an Error, but it threw ' + j$.pp(thrown) + '.'; }; - return fail; - } - - if (errorMatcher.hasNoSpecifics()) { - pass.message = 'Expected function not to throw an Error, but it threw ' + fnNameFor(thrown) + '.'; - return pass; - } - - if (errorMatcher.matches(thrown)) { - pass.message = function() { - return 'Expected function not to throw ' + errorMatcher.errorTypeDescription + errorMatcher.messageDescription() + '.'; - }; - return pass; - } else { - fail.message = function() { - return 'Expected function to throw ' + errorMatcher.errorTypeDescription + errorMatcher.messageDescription() + - ', but it threw ' + errorMatcher.thrownDescription(thrown) + '.'; - }; - return fail; - } - } - }; - - function getMatcher() { - var expected = null, - errorType = null; - - if (arguments.length == 2) { - expected = arguments[1]; - if (isAnErrorType(expected)) { - errorType = expected; - expected = null; - } - } else if (arguments.length > 2) { - errorType = arguments[1]; - expected = arguments[2]; - if (!isAnErrorType(errorType)) { - throw new Error('Expected error type is not an Error.'); - } - } - - if (expected && !isStringOrRegExp(expected)) { - if (errorType) { - throw new Error('Expected error message is not a string or RegExp.'); - } else { - throw new Error('Expected is not an Error, string, or RegExp.'); - } - } - - function messageMatch(message) { - if (typeof expected == 'string') { - return expected == message; - } else { - return expected.test(message); - } - } - - return { - errorTypeDescription: errorType ? fnNameFor(errorType) : 'an exception', - thrownDescription: function(thrown) { - var thrownName = errorType ? fnNameFor(thrown.constructor) : 'an exception', - thrownMessage = ''; - - if (expected) { - thrownMessage = ' with message ' + j$.pp(thrown.message); - } - - return thrownName + thrownMessage; - }, - messageDescription: function() { - if (expected === null) { - return ''; - } else if (expected instanceof RegExp) { - return ' with a message matching ' + j$.pp(expected); - } else { - return ' with message ' + j$.pp(expected); - } - }, - hasNoSpecifics: function() { - return expected === null && errorType === null; - }, - matches: function(error) { - return (errorType === null || error.constructor === errorType) && - (expected === null || messageMatch(error.message)); - } - }; - } - - function fnNameFor(func) { - return func.name || func.toString().match(/^\s*function\s*(\w*)\s*\(/)[1]; - } - - function isStringOrRegExp(potential) { - return potential instanceof RegExp || (typeof potential == 'string'); - } - - function isAnErrorType(type) { - if (typeof type !== 'function') { - return false; - } - - var Surrogate = function() {}; - Surrogate.prototype = type.prototype; - return (new Surrogate()) instanceof Error; - } - } - - return toThrowError; -}; - -getJasmineRequireObj().interface = function(jasmine, env) { - var jasmineInterface = { - describe: function(description, specDefinitions) { - return env.describe(description, specDefinitions); - }, - - xdescribe: function(description, specDefinitions) { - return env.xdescribe(description, specDefinitions); - }, - - fdescribe: function(description, specDefinitions) { - return env.fdescribe(description, specDefinitions); - }, - - it: function(desc, func) { - return env.it(desc, func); - }, - - xit: function(desc, func) { - return env.xit(desc, func); - }, - - fit: function(desc, func) { - return env.fit(desc, func); - }, - - beforeEach: function(beforeEachFunction) { - return env.beforeEach(beforeEachFunction); - }, - - afterEach: function(afterEachFunction) { - return env.afterEach(afterEachFunction); - }, - - beforeAll: function(beforeAllFunction) { - return env.beforeAll(beforeAllFunction); - }, - - afterAll: function(afterAllFunction) { - return env.afterAll(afterAllFunction); - }, - - expect: function(actual) { - return env.expect(actual); - }, - - pending: function() { - return env.pending(); - }, - - fail: function() { - return env.fail.apply(env, arguments); - }, - - spyOn: function(obj, methodName) { - return env.spyOn(obj, methodName); - }, - - jsApiReporter: new jasmine.JsApiReporter({ - timer: new jasmine.Timer() - }), - - jasmine: jasmine - }; - - jasmine.addCustomEqualityTester = function(tester) { - env.addCustomEqualityTester(tester); - }; - - jasmine.addMatchers = function(matchers) { - return env.addMatchers(matchers); - }; - - jasmine.clock = function() { - return env.clock; - }; - - return jasmineInterface; -}; - -getJasmineRequireObj().version = function() { - return '2.1.3'; -}; diff --git a/tests/jasmine-2.1.3/jasmine_favicon.png b/tests/jasmine-2.1.3/jasmine_favicon.png deleted file mode 100755 index 3b84583be4..0000000000 Binary files a/tests/jasmine-2.1.3/jasmine_favicon.png and /dev/null differ diff --git a/tests/tests.html b/tests/tests.html deleted file mode 100755 index 0d298c493c..0000000000 --- a/tests/tests.html +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/tests/tests.js b/tests/tests.js deleted file mode 100644 index 495ca8d0fc..0000000000 --- a/tests/tests.js +++ /dev/null @@ -1,26 +0,0 @@ -window.jasmineRequire = require('./jasmine-2.1.3/jasmine'); -require('./jasmine-2.1.3/jasmine-html'); -require('./jasmine-2.1.3/boot'); -var consoleReporter = require('./jasmine-2.1.3/console'); -var app = require('remote').require('app'); - -jasmine.getEnv().addReporter(new consoleReporter.ConsoleReporter()({ - showColors: true, - timer: new jasmine.Timer(), - verbose: true, - print: function() { - process.stdout.write.apply(process.stdout, arguments); - }, - onComplete: function () { - app.quit(); - } - })); - -var fs = require('fs'); -var tests = fs.readdirSync('./tests').filter(function (f) { - return f.indexOf('-' + process.env.TEST_TYPE) !== -1; -}); - -tests.forEach(function (t) { - require('./' + t); -});