From 05178f8b05075f9689433160cbc30483aa10dd3e Mon Sep 17 00:00:00 2001 From: Clemens Sahs Date: Thu, 12 Dec 2013 11:52:54 +0100 Subject: [PATCH 1/6] init travis --- .travis.yml | 22 ++++++++++++++++++++++ Gruntfile.js | 27 +++++++++++++++++++++++++++ Rakefile | 5 +++++ _config.yml | 2 +- package.json | 11 +++++++++++ tests/ghost/test_meetup.js | 16 ++++++++++++++++ 6 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 .travis.yml create mode 100644 Gruntfile.js create mode 100644 package.json create mode 100644 tests/ghost/test_meetup.js diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..6593a81 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,22 @@ +language: ruby +rvm: + - 1.9.3 +before_install: + - npm install -g grunt-cli + - git clone git://github.com/n1k0/casperjs.git ~/casperjs + - cd ~/casperjs + - git checkout tags/1.1-beta3 + - export PATH=$PATH:`pwd`/bin + - cd - +before_script: + - npm install + - phantomjs --version + - casperjs --version + +notifications: + email: false + +script: + - bundle exec rake travis + - sleep 3 + - npm test diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 0000000..ed2a2d0 --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,27 @@ +'use strict'; + +module.exports = function(grunt) { + grunt.initConfig({ + ghost: { + test: { + files: [{ + src: ['tests/ghost/test_*.js'] + }] + }, + options: { + args: { + baseUrl: 'http://localhost:4000' + }, + direct: false, + logLevel: 'error', + printCommand: false, + printFilePaths: true + } + } + }); + + grunt.loadNpmTasks('grunt-ghost'); + + grunt.registerTask('test', ['ghost']); + grunt.registerTask('default', ['ghost']); +}; diff --git a/Rakefile b/Rakefile index af0a275..8d543d8 100755 --- a/Rakefile +++ b/Rakefile @@ -136,6 +136,11 @@ task :preview do system "jekyll serve -w" end # task :preview +desc "Launch travis environment" +task :travis do + system "jekyll serve --detach --port 4000" +end # task :travis + # Public: Alias - Maintains backwards compatability for theme switching. task :switch_theme => "theme:switch" diff --git a/_config.yml b/_config.yml index f1d7f39..d0c353d 100755 --- a/_config.yml +++ b/_config.yml @@ -2,7 +2,7 @@ # For more see: https://github.com/mojombo/jekyll/wiki/Permalinks permalink: /:categories/:year/:month/:day/:title -exclude: [".rvmrc", ".rbenv-version", "README.md", "Rakefile", "changelog.md"] +exclude: [".rvmrc", ".rbenv-version", "README.md", "Rakefile", "changelog.md","vendor"] pygments: true # Themes are encouraged to use these universal variables diff --git a/package.json b/package.json new file mode 100644 index 0000000..956a609 --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "scripts": { + "test": "grunt test" + }, + "dependencies": {}, + "devDependencies": { + "grunt": "0.4.1", + "grunt-contrib-connect": "0.2.0", + "grunt-ghost": "1.0.8" + } +} diff --git a/tests/ghost/test_meetup.js b/tests/ghost/test_meetup.js new file mode 100644 index 0000000..9386907 --- /dev/null +++ b/tests/ghost/test_meetup.js @@ -0,0 +1,16 @@ +casper.options.logLevel = "error"; +casper.options.verbose = false; + +casper.test.begin('check meetup widget', function suite(test) { + casper + + .start('http://127.0.0.1:4000/index.html') + + .then(function() { + test.assertExists('.next'); + }) + + .run(function() { + test.done(); + }); +}); From adf5699cda985b3b6f8abe3f4c7523ee1a57d458 Mon Sep 17 00:00:00 2001 From: Ole Michaelis Date: Thu, 12 Dec 2013 23:22:51 +0100 Subject: [PATCH 2/6] remove unneccessary modules and installers --- .gitignore | 1 + .travis.yml | 15 +++------------ Rakefile | 5 ----- package.json | 11 ----------- tests/{ghost => }/test_meetup.js | 0 5 files changed, 4 insertions(+), 28 deletions(-) delete mode 100644 package.json rename tests/{ghost => }/test_meetup.js (100%) diff --git a/.gitignore b/.gitignore index 6abd84a..ac31866 100755 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ Thumbs.db .rbenv-version .rvmrc +node_modules diff --git a/.travis.yml b/.travis.yml index 6593a81..9647f7e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,21 +2,12 @@ language: ruby rvm: - 1.9.3 before_install: - - npm install -g grunt-cli - - git clone git://github.com/n1k0/casperjs.git ~/casperjs - - cd ~/casperjs - - git checkout tags/1.1-beta3 - - export PATH=$PATH:`pwd`/bin - - cd - -before_script: - - npm install - - phantomjs --version - - casperjs --version + - npm install casperjs notifications: email: false script: - - bundle exec rake travis + - jekyll serve --detach --port 4000 - sleep 3 - - npm test + - ./node_modules/.bin/casperjs test tests/* diff --git a/Rakefile b/Rakefile index 8d543d8..af0a275 100755 --- a/Rakefile +++ b/Rakefile @@ -136,11 +136,6 @@ task :preview do system "jekyll serve -w" end # task :preview -desc "Launch travis environment" -task :travis do - system "jekyll serve --detach --port 4000" -end # task :travis - # Public: Alias - Maintains backwards compatability for theme switching. task :switch_theme => "theme:switch" diff --git a/package.json b/package.json deleted file mode 100644 index 956a609..0000000 --- a/package.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "scripts": { - "test": "grunt test" - }, - "dependencies": {}, - "devDependencies": { - "grunt": "0.4.1", - "grunt-contrib-connect": "0.2.0", - "grunt-ghost": "1.0.8" - } -} diff --git a/tests/ghost/test_meetup.js b/tests/test_meetup.js similarity index 100% rename from tests/ghost/test_meetup.js rename to tests/test_meetup.js From f66768e928484faa10d13534c26747af2c3b23de Mon Sep 17 00:00:00 2001 From: Ole Michaelis Date: Thu, 12 Dec 2013 23:31:21 +0100 Subject: [PATCH 3/6] jekyll can only run in buldes to load binaries --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9647f7e..8b581d5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,6 @@ notifications: email: false script: - - jekyll serve --detach --port 4000 + - bundle exec jekyll serve --detach --port 4000 - sleep 3 - ./node_modules/.bin/casperjs test tests/* From 263c39aaefcd7ca63b39ea147d893375ef895af2 Mon Sep 17 00:00:00 2001 From: Ole Michaelis Date: Thu, 12 Dec 2013 23:35:10 +0100 Subject: [PATCH 4/6] speed up tests by 800% :D --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 8b581d5..ee39f89 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,8 @@ language: ruby rvm: - 1.9.3 +cache: bundler + before_install: - npm install casperjs From 7795478e6ea1cdb9161e42f93c2979a4adcee89e Mon Sep 17 00:00:00 2001 From: Ole Michaelis Date: Thu, 12 Dec 2013 23:40:07 +0100 Subject: [PATCH 5/6] need this to test latest changes From a0a21c12458fb3154aa6b5c0afde338a2192f136 Mon Sep 17 00:00:00 2001 From: Ole Michaelis Date: Fri, 13 Dec 2013 11:08:56 +0100 Subject: [PATCH 6/6] specify what to test --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ee39f89..80f403f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,4 +12,4 @@ notifications: script: - bundle exec jekyll serve --detach --port 4000 - sleep 3 - - ./node_modules/.bin/casperjs test tests/* + - ./node_modules/.bin/casperjs test tests/test_*.js