From 998336f1f821d4a4e18134344f6adbbc14ee5329 Mon Sep 17 00:00:00 2001 From: Eric Clemmons Date: Wed, 18 Dec 2013 09:35:19 -0800 Subject: [PATCH 01/21] Add testing with mocha --- package.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index d84839b..7c7a07c 100644 --- a/package.json +++ b/package.json @@ -12,9 +12,12 @@ "ssh-keygen": "~0.2.1", "yeoman-generator": "~0.14.0-rc.1" }, - "devDependencies": {}, + "devDependencies": { + "hooker": "~0.2.3", + "mocha": "~1.15.1" + }, "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" + "test": "mocha" }, "repository": { "type": "git", From b10bb20c8247ae24e636f7cf9ef97f7d990744d7 Mon Sep 17 00:00:00 2001 From: Eric Clemmons Date: Wed, 18 Dec 2013 09:36:32 -0800 Subject: [PATCH 02/21] Force sourceRoot --- generator/app/index.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/generator/app/index.js b/generator/app/index.js index 5124b1b..396be1f 100644 --- a/generator/app/index.js +++ b/generator/app/index.js @@ -29,6 +29,8 @@ var WordpressGenerator = function(args, options, config) { }.bind(this) }); }); + + this.sourceRoot(path.join(__dirname, 'templates')); }; util.inherits(WordpressGenerator, yeoman.generators.Base); @@ -306,7 +308,7 @@ WordpressGenerator.prototype.writeWeb = function() { this.htaccessFile = ''; } - this.template('web/htaccess', path.join(this.props.web, '.htaccess')); + this.template('web/htaccess', path.join(this.props.web, '.htaccess')); this.template('web/no_robots.txt', path.join(this.props.web, 'no_robots.txt')); this.template('web/robots.txt', path.join(this.props.web, 'robots.txt')); }; From e05aa0ba429947085f994722a9f7d0de88c3d374 Mon Sep 17 00:00:00 2001 From: Eric Clemmons Date: Wed, 18 Dec 2013 09:37:07 -0800 Subject: [PATCH 03/21] Initial mocha test --- .gitignore | 1 + test/generator.app.js | 32 ++++++++++++++++++++ test/support/bootstrap.js | 61 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 94 insertions(+) create mode 100644 test/generator.app.js create mode 100644 test/support/bootstrap.js diff --git a/.gitignore b/.gitignore index c2658d7..c7ed7ea 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ node_modules/ +test/temp/ diff --git a/test/generator.app.js b/test/generator.app.js new file mode 100644 index 0000000..9b02e42 --- /dev/null +++ b/test/generator.app.js @@ -0,0 +1,32 @@ +'use strict'; + +var assert = require('assert'); +var Bootstrap = require('./support/bootstrap'); +var helpers = require('yeoman-generator').test; + +describe('Genesis WordPress generator', function () { + this.timeout(0); + + beforeEach(function(done) { + Bootstrap.beforeEach(this, done); + }); + + it('can be ran', function(done) { + this.app.run({}, function() { + helpers.assertFiles([ + 'bin/provision', + 'deployment/deploy.rb', + 'provisioning/provision.yml', + 'provisioning/files/ssh/id_rsa', + 'provisioning/files/ssh/id_rsa.pub', + 'web/wp-config.php', + 'bower.json', + 'Capfile', + 'README.md', + 'Vagrantfile', + ]); + + done(); + }); + }); +}); diff --git a/test/support/bootstrap.js b/test/support/bootstrap.js new file mode 100644 index 0000000..6dd496c --- /dev/null +++ b/test/support/bootstrap.js @@ -0,0 +1,61 @@ +var hooker = require('hooker'); +var path = require('path'); +var helpers = require('yeoman-generator').test; + +var Bootstrap = {}; + +Bootstrap.app = function(test) { + test.app = helpers.createGenerator('genesis-wordpress:app', [ + [require('../../generator/app'), 'genesis-wordpress:app'] + ]); + + test.app.options['skip-install'] = true; + + return test.app; +}; + +Bootstrap.beforeEach = function(test, done) { + helpers.testDirectory(path.join(__dirname, '..', 'temp'), function(err) { + if (err) { + return done(err); + } + + Bootstrap.app(test); + Bootstrap.prompts(test); + + done(); + }); +}; + +Bootstrap.prompts = function(test) { + hooker.hook(test.app, 'prompt', function(prompts, done) { + var answers = { + name: 'GeneratorTest.com', + domain: 'generatortest.com', + ip: '10.10.73.57', + DB_NAME: 'generator_test', + DB_USER: 'generator_test', + DB_PASSWORD: 'generator_test' + }; + + prompts.forEach(function(prompt) { + if (answers[prompt.name]) { + return; + } + + if (prompt.default instanceof Function) { + answers[prompt.name] = prompt.default(answers); + } else { + answers[prompt.name] = prompt.default; + } + }); + + hooker.unhook(test.app, 'prompt'); + + done(answers); + + return hooker.preempt(answers); + }); +}; + +module.exports = Bootstrap; From a779e188a226fc1ff29dfc50b1572dc80a3dc075 Mon Sep 17 00:00:00 2001 From: Eric Clemmons Date: Wed, 18 Dec 2013 09:53:01 -0800 Subject: [PATCH 04/21] Add .travis.yml --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..b9207e5 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,4 @@ +language: node_js +node_js: + - '0.8' + - '0.10' From 41deacce95efe2071c99f89dde59b9423fa24c04 Mon Sep 17 00:00:00 2001 From: Eric Clemmons Date: Wed, 18 Dec 2013 09:59:21 -0800 Subject: [PATCH 05/21] Add travis-ci badge --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e4a3fb6..f30859f 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ -Genesis WordPress -================= +# Genesis WordPress + +[![Build Status](https://travis-ci.org/genesis/wordpress.png)](https://travis-ci.org/genesis/wordpress) + > Rapidly create, develop, & deploy WordPress across multiple environments. > ![Genesis WordPress Demo](demo.gif) From 876d72f6c7e833e715ac67beca7c3a3656062886 Mon Sep 17 00:00:00 2001 From: Eric Clemmons Date: Wed, 18 Dec 2013 16:19:46 -0800 Subject: [PATCH 06/21] Working functional test --- .travis.yml | 9 +++- package.json | 5 +- test/generator.app.js | 32 ------------- test/generator.js | 31 ++++++++++++ test/site.install.js | 47 ++++++++++++++++++ test/support/generate | 6 +++ test/support/{bootstrap.js => generator.js} | 53 +++++++++++---------- 7 files changed, 121 insertions(+), 62 deletions(-) delete mode 100644 test/generator.app.js create mode 100644 test/generator.js create mode 100644 test/site.install.js create mode 100755 test/support/generate rename test/support/{bootstrap.js => generator.js} (60%) diff --git a/.travis.yml b/.travis.yml index b9207e5..33c3528 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,9 @@ language: node_js node_js: - - '0.8' - - '0.10' + - "0.8" + - "0.10" +hosts: + - local.generatortest.com +before_script: + - ./test/support/generate + - ./test/temp/bin/provision diff --git a/package.json b/package.json index 7c7a07c..f86bf52 100644 --- a/package.json +++ b/package.json @@ -14,10 +14,11 @@ }, "devDependencies": { "hooker": "~0.2.3", - "mocha": "~1.15.1" + "mocha": "~1.15.1", + "zombie": "~2.0.0-alpha24" }, "scripts": { - "test": "mocha" + "test": "mocha --reporter spec" }, "repository": { "type": "git", diff --git a/test/generator.app.js b/test/generator.app.js deleted file mode 100644 index 9b02e42..0000000 --- a/test/generator.app.js +++ /dev/null @@ -1,32 +0,0 @@ -'use strict'; - -var assert = require('assert'); -var Bootstrap = require('./support/bootstrap'); -var helpers = require('yeoman-generator').test; - -describe('Genesis WordPress generator', function () { - this.timeout(0); - - beforeEach(function(done) { - Bootstrap.beforeEach(this, done); - }); - - it('can be ran', function(done) { - this.app.run({}, function() { - helpers.assertFiles([ - 'bin/provision', - 'deployment/deploy.rb', - 'provisioning/provision.yml', - 'provisioning/files/ssh/id_rsa', - 'provisioning/files/ssh/id_rsa.pub', - 'web/wp-config.php', - 'bower.json', - 'Capfile', - 'README.md', - 'Vagrantfile', - ]); - - done(); - }); - }); -}); diff --git a/test/generator.js b/test/generator.js new file mode 100644 index 0000000..33fcb71 --- /dev/null +++ b/test/generator.js @@ -0,0 +1,31 @@ +'use strict'; + +var assert = require('assert'); +var Browser = require('zombie'); +var fs = require('fs'); +var path = require('path'); + +describe('Genesis WordPress', function () { + describe('generator', function() { + it('should create required files', function(done) { + [ + 'bin/provision', + 'deployment/deploy.rb', + 'provisioning/provision.yml', + 'provisioning/files/ssh/id_rsa', + 'provisioning/files/ssh/id_rsa.pub', + 'web/wp-config.php', + 'bower.json', + 'Capfile', + 'README.md', + 'Vagrantfile', + ].forEach(function(file) { + var filePath = path.join(__dirname, 'temp', file); + + assert.ok(fs.existsSync(filePath), 'File not created: ' + filePath); + }); + + done(); + }); + }); +}); diff --git a/test/site.install.js b/test/site.install.js new file mode 100644 index 0000000..f839a13 --- /dev/null +++ b/test/site.install.js @@ -0,0 +1,47 @@ +'use strict'; + +var assert = require('assert'); +var Browser = require('zombie'); +var fs = require('fs'); +var path = require('path'); + +describe('Genesis WordPress', function () { + describe('site', function() { + it('may not be installed', function(done) { + var browser = new Browser(); + + this.timeout(0); + + browser + .visit('http://local.generatortest.com/wp-admin/install.php') + .then(function() { + if (browser.button('Install WordPress')) { + browser + .fill('Site Title', 'Genesis WordPress Test') + .fill('Username', 'test') + .fill('admin_password', 'test') + .fill('admin_password2', 'test') + .fill('Your E-mail', 'test@example.com') + .uncheck('blog_public') + ; + + return browser.pressButton('Install WordPress'); + } + }) + .then(done, done) + ; + }); + + it('should be installed', function(done) { + var browser = new Browser(); + + browser + .visit('http://local.generatortest.com/wp-admin/install.php') + .then(function() { + assert.equal('Log In', browser.text('a.button')); + }) + .then(done, done) + ; + }) + }); +}); diff --git a/test/support/generate b/test/support/generate new file mode 100755 index 0000000..8b56146 --- /dev/null +++ b/test/support/generate @@ -0,0 +1,6 @@ +#!/usr/bin/env node + +var Generator = require('./generator'); +var generator = new Generator(); + +generator.run(); diff --git a/test/support/bootstrap.js b/test/support/generator.js similarity index 60% rename from test/support/bootstrap.js rename to test/support/generator.js index 6dd496c..bd41154 100644 --- a/test/support/bootstrap.js +++ b/test/support/generator.js @@ -1,38 +1,23 @@ +#!/usr/bin/env node + var hooker = require('hooker'); var path = require('path'); var helpers = require('yeoman-generator').test; -var Bootstrap = {}; +var Generator = function() {}; -Bootstrap.app = function(test) { - test.app = helpers.createGenerator('genesis-wordpress:app', [ +Generator.prototype.create = function() { + this.app = helpers.createGenerator('genesis-wordpress:app', [ [require('../../generator/app'), 'genesis-wordpress:app'] ]); - - test.app.options['skip-install'] = true; - - return test.app; -}; - -Bootstrap.beforeEach = function(test, done) { - helpers.testDirectory(path.join(__dirname, '..', 'temp'), function(err) { - if (err) { - return done(err); - } - - Bootstrap.app(test); - Bootstrap.prompts(test); - - done(); - }); }; -Bootstrap.prompts = function(test) { - hooker.hook(test.app, 'prompt', function(prompts, done) { +Generator.prototype.prompts = function() { + hooker.hook(this.app, 'prompt', function(prompts, done) { var answers = { name: 'GeneratorTest.com', domain: 'generatortest.com', - ip: '10.10.73.57', + ip: '192.168.137.137', DB_NAME: 'generator_test', DB_USER: 'generator_test', DB_PASSWORD: 'generator_test' @@ -50,12 +35,28 @@ Bootstrap.prompts = function(test) { } }); - hooker.unhook(test.app, 'prompt'); + hooker.unhook(this.app, 'prompt'); done(answers); return hooker.preempt(answers); - }); + }.bind(this)); }; -module.exports = Bootstrap; +Generator.prototype.run = function() { + helpers.testDirectory(path.join(__dirname, '..', 'temp'), function(err) { + if (err) { + throw err; + } + + this.create(); + this.prompts(); + + this.app.run({}, function() { + console.log('Done!'); + }); + }.bind(this)); +}; + + +module.exports = Generator; From 28458768696c0e007eea283dc5667d2323a8f7b2 Mon Sep 17 00:00:00 2001 From: Eric Clemmons Date: Wed, 18 Dec 2013 16:31:30 -0800 Subject: [PATCH 07/21] sudo provision me a sandwhich --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 33c3528..95d1cdc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,4 +6,4 @@ hosts: - local.generatortest.com before_script: - ./test/support/generate - - ./test/temp/bin/provision + - sudo ./test/temp/bin/provision From 2cab45c44409b1fa4880661d109d52b7f5f86da2 Mon Sep 17 00:00:00 2001 From: Eric Clemmons Date: Wed, 18 Dec 2013 16:36:54 -0800 Subject: [PATCH 08/21] Install bower --- .travis.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 95d1cdc..38826c5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,10 @@ node_js: - "0.10" hosts: - local.generatortest.com +install: + - npm install -g bower before_script: - - ./test/support/generate - - sudo ./test/temp/bin/provision + - cd ./test/support + - ./generate + - bower install + - sudo ./bin/provision From 51697c64a4af81d7b2fbce172368c9db688f5476 Mon Sep 17 00:00:00 2001 From: Eric Clemmons Date: Wed, 18 Dec 2013 17:16:40 -0800 Subject: [PATCH 09/21] NPM install --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 38826c5..81be2ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,5 +9,6 @@ install: before_script: - cd ./test/support - ./generate + - npm install - bower install - sudo ./bin/provision From 6ba76142953574ebcba296f87c2f17966dd8cb70 Mon Sep 17 00:00:00 2001 From: Eric Clemmons Date: Wed, 18 Dec 2013 17:21:26 -0800 Subject: [PATCH 10/21] Install before generation --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 81be2ca..19d2689 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,8 +7,7 @@ hosts: install: - npm install -g bower before_script: - - cd ./test/support - - ./generate - npm install - bower install - - sudo ./bin/provision + - ./test/support/generate + - sudo ./test/temp/bin/provision From 2496882a47e25a7f81df0c6b3f6530a8c714ed61 Mon Sep 17 00:00:00 2001 From: Eric Clemmons Date: Wed, 18 Dec 2013 17:31:19 -0800 Subject: [PATCH 11/21] Install tasksel --- provisioning/roles/common/vars/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/provisioning/roles/common/vars/main.yml b/provisioning/roles/common/vars/main.yml index 92d03ee..500bde0 100644 --- a/provisioning/roles/common/vars/main.yml +++ b/provisioning/roles/common/vars/main.yml @@ -2,6 +2,7 @@ system_packages: - build-essential - autoconf + - tasksel - re2c - curl - git-core From 5177bb60fcc44e769d9ed19a991616cf8519c88e Mon Sep 17 00:00:00 2001 From: Eric Clemmons Date: Wed, 18 Dec 2013 17:41:50 -0800 Subject: [PATCH 12/21] Install latest genesis-wordpress branch --- test/support/generator.js | 1 + 1 file changed, 1 insertion(+) diff --git a/test/support/generator.js b/test/support/generator.js index bd41154..656f6bf 100644 --- a/test/support/generator.js +++ b/test/support/generator.js @@ -18,6 +18,7 @@ Generator.prototype.prompts = function() { name: 'GeneratorTest.com', domain: 'generatortest.com', ip: '192.168.137.137', + genesis: 'git@github.com/genesis/wordpress.git#69-tests', DB_NAME: 'generator_test', DB_USER: 'generator_test', DB_PASSWORD: 'generator_test' From 9e015322f92fde6c7476d2f0fd302b24762b31b9 Mon Sep 17 00:00:00 2001 From: Eric Clemmons Date: Wed, 18 Dec 2013 17:50:58 -0800 Subject: [PATCH 13/21] bower install in test/temp --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 19d2689..6d3085b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,6 @@ install: - npm install -g bower before_script: - npm install - - bower install - ./test/support/generate + - cd ./test/temp && bower install - sudo ./test/temp/bin/provision From 51c99ed454b6118439aa8c06c70f9be881423bcb Mon Sep 17 00:00:00 2001 From: Eric Clemmons Date: Wed, 18 Dec 2013 17:55:44 -0800 Subject: [PATCH 14/21] Correct bower install --- .travis.yml | 1 - test/support/generator.js | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6d3085b..72d04ef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,5 +9,4 @@ install: before_script: - npm install - ./test/support/generate - - cd ./test/temp && bower install - sudo ./test/temp/bin/provision diff --git a/test/support/generator.js b/test/support/generator.js index 656f6bf..50d5cfe 100644 --- a/test/support/generator.js +++ b/test/support/generator.js @@ -18,7 +18,7 @@ Generator.prototype.prompts = function() { name: 'GeneratorTest.com', domain: 'generatortest.com', ip: '192.168.137.137', - genesis: 'git@github.com/genesis/wordpress.git#69-tests', + genesis: 'https://github.com/genesis/wordpress.git#69-tests', DB_NAME: 'generator_test', DB_USER: 'generator_test', DB_PASSWORD: 'generator_test' From ed0dc416466c148a4d495d6b4797e4d615d42678 Mon Sep 17 00:00:00 2001 From: Eric Clemmons Date: Wed, 18 Dec 2013 22:34:00 -0800 Subject: [PATCH 15/21] Debug mode --- test/site.install.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/site.install.js b/test/site.install.js index f839a13..1337137 100644 --- a/test/site.install.js +++ b/test/site.install.js @@ -8,7 +8,7 @@ var path = require('path'); describe('Genesis WordPress', function () { describe('site', function() { it('may not be installed', function(done) { - var browser = new Browser(); + var browser = new Browser({ debug: true }); this.timeout(0); @@ -33,7 +33,7 @@ describe('Genesis WordPress', function () { }); it('should be installed', function(done) { - var browser = new Browser(); + var browser = new Browser({ debug: true }); browser .visit('http://local.generatortest.com/wp-admin/install.php') From 24966a24942c444c8955702ed198f24e6e78baf3 Mon Sep 17 00:00:00 2001 From: Eric Clemmons Date: Wed, 18 Dec 2013 22:46:10 -0800 Subject: [PATCH 16/21] Symlink web to /vagrant/web --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 72d04ef..dfb40e5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,4 +9,6 @@ install: before_script: - npm install - ./test/support/generate + - mkdir /vagrant + - ln -s "${PWD}/test/temp/web" /vagrant/web - sudo ./test/temp/bin/provision From f167bfd57466db95dd9af70a348cf41b4663c07f Mon Sep 17 00:00:00 2001 From: Eric Clemmons Date: Wed, 18 Dec 2013 22:49:11 -0800 Subject: [PATCH 17/21] sudo mkdir --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index dfb40e5..2ae36f1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,6 @@ install: before_script: - npm install - ./test/support/generate - - mkdir /vagrant - - ln -s "${PWD}/test/temp/web" /vagrant/web + - sudo mkdir /vagrant + - sudo ln -s "${PWD}/test/temp/web" /vagrant/web - sudo ./test/temp/bin/provision From caa9e1bde0e345fa9421dd3b3909b05d12ead08c Mon Sep 17 00:00:00 2001 From: Eric Clemmons Date: Wed, 18 Dec 2013 22:57:38 -0800 Subject: [PATCH 18/21] console.log(browser.html()); --- test/site.install.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/site.install.js b/test/site.install.js index 1337137..611fec6 100644 --- a/test/site.install.js +++ b/test/site.install.js @@ -15,6 +15,8 @@ describe('Genesis WordPress', function () { browser .visit('http://local.generatortest.com/wp-admin/install.php') .then(function() { + console.log(browser.html()); + if (browser.button('Install WordPress')) { browser .fill('Site Title', 'Genesis WordPress Test') @@ -34,10 +36,10 @@ describe('Genesis WordPress', function () { it('should be installed', function(done) { var browser = new Browser({ debug: true }); - browser .visit('http://local.generatortest.com/wp-admin/install.php') .then(function() { + console.log(browser.html()); assert.equal('Log In', browser.text('a.button')); }) .then(done, done) From 7b969d204067d1163695ba68005b56fc3cea2d9a Mon Sep 17 00:00:00 2001 From: Eric Clemmons Date: Wed, 18 Dec 2013 23:07:52 -0800 Subject: [PATCH 19/21] Fix hosts addon --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2ae36f1..b3ece21 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,8 +2,9 @@ language: node_js node_js: - "0.8" - "0.10" -hosts: - - local.generatortest.com +addons: + hosts: + - local.generatortest.com install: - npm install -g bower before_script: From d424d05bfc632c9abafde728aedb8db12bf356ad Mon Sep 17 00:00:00 2001 From: Eric Clemmons Date: Wed, 18 Dec 2013 23:13:40 -0800 Subject: [PATCH 20/21] Remove debug code --- test/site.install.js | 8 +++----- test/support/generator.js | 4 +--- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/test/site.install.js b/test/site.install.js index 611fec6..f839a13 100644 --- a/test/site.install.js +++ b/test/site.install.js @@ -8,15 +8,13 @@ var path = require('path'); describe('Genesis WordPress', function () { describe('site', function() { it('may not be installed', function(done) { - var browser = new Browser({ debug: true }); + var browser = new Browser(); this.timeout(0); browser .visit('http://local.generatortest.com/wp-admin/install.php') .then(function() { - console.log(browser.html()); - if (browser.button('Install WordPress')) { browser .fill('Site Title', 'Genesis WordPress Test') @@ -35,11 +33,11 @@ describe('Genesis WordPress', function () { }); it('should be installed', function(done) { - var browser = new Browser({ debug: true }); + var browser = new Browser(); + browser .visit('http://local.generatortest.com/wp-admin/install.php') .then(function() { - console.log(browser.html()); assert.equal('Log In', browser.text('a.button')); }) .then(done, done) diff --git a/test/support/generator.js b/test/support/generator.js index 50d5cfe..f72298c 100644 --- a/test/support/generator.js +++ b/test/support/generator.js @@ -53,9 +53,7 @@ Generator.prototype.run = function() { this.create(); this.prompts(); - this.app.run({}, function() { - console.log('Done!'); - }); + this.app.run({}, function() {}); }.bind(this)); }; From 4528eb4b0784e3ed4a1ebbbdef984a67467999e7 Mon Sep 17 00:00:00 2001 From: Eric Clemmons Date: Wed, 18 Dec 2013 23:14:11 -0800 Subject: [PATCH 21/21] Remove genesis version --- test/support/generator.js | 1 - 1 file changed, 1 deletion(-) diff --git a/test/support/generator.js b/test/support/generator.js index f72298c..bccc13e 100644 --- a/test/support/generator.js +++ b/test/support/generator.js @@ -18,7 +18,6 @@ Generator.prototype.prompts = function() { name: 'GeneratorTest.com', domain: 'generatortest.com', ip: '192.168.137.137', - genesis: 'https://github.com/genesis/wordpress.git#69-tests', DB_NAME: 'generator_test', DB_USER: 'generator_test', DB_PASSWORD: 'generator_test'