From cc49b87a97b19b546c410bde9752f714da8fcf96 Mon Sep 17 00:00:00 2001 From: Sven Fuchs Date: Mon, 25 Jun 2012 18:41:09 +0200 Subject: [PATCH] try using jasmine for specs --- AssetFile | 31 +- assets/javascripts/app/app.coffee | 2 - assets/javascripts/app/helpers/urls.coffee | 5 +- .../javascripts/app/templates/builds/list.hbs | 2 +- .../app/templates/repositories/list.hbs | 34 +- assets/javascripts/spec/foo.spec.js | 5 - assets/javascripts/spec/foo_spec.coffee | 14 + assets/javascripts/spec/spec_helper.coffee | 11 + assets/javascripts/spec/support/index.html | 23 - .../javascripts/spec/vendor/jasmine-html.js | 616 ++ .../javascripts/spec/vendor/jasmine-runner.js | 104 + assets/javascripts/spec/vendor/jasmine.js | 2529 ++++++ assets/javascripts/spec/vendor/mocha.js | 4477 --------- assets/javascripts/spec/vendor/sinon.js | 3555 ++++++++ public/index.html | 1 + public/javascripts/application.js | 2 +- public/javascripts/spec/foo_spec.js | 21 + public/javascripts/spec/spec_helper.js | 15 + public/javascripts/specs/specs.js | 28 + public/javascripts/specs/vendor.js | 8005 +++++++++++++++++ public/spec.html | 30 + public/stylesheets/jasmine.css | 79 + public/stylesheets/mocha.css | 176 + run_jasmine.coffee | 46 + .../spec/support/run-mocha.js => run_mocha.js | 0 25 files changed, 15274 insertions(+), 4537 deletions(-) delete mode 100644 assets/javascripts/spec/foo.spec.js create mode 100644 assets/javascripts/spec/foo_spec.coffee create mode 100644 assets/javascripts/spec/spec_helper.coffee delete mode 100644 assets/javascripts/spec/support/index.html create mode 100644 assets/javascripts/spec/vendor/jasmine-html.js create mode 100644 assets/javascripts/spec/vendor/jasmine-runner.js create mode 100644 assets/javascripts/spec/vendor/jasmine.js delete mode 100644 assets/javascripts/spec/vendor/mocha.js create mode 100644 assets/javascripts/spec/vendor/sinon.js create mode 100644 public/javascripts/spec/foo_spec.js create mode 100644 public/javascripts/spec/spec_helper.js create mode 100644 public/javascripts/specs/specs.js create mode 100644 public/javascripts/specs/vendor.js create mode 100644 public/spec.html create mode 100644 public/stylesheets/jasmine.css create mode 100644 public/stylesheets/mocha.css create mode 100755 run_jasmine.coffee rename assets/javascripts/spec/support/run-mocha.js => run_mocha.js (100%) diff --git a/AssetFile b/AssetFile index 035412ff..36294dae 100644 --- a/AssetFile +++ b/AssetFile @@ -20,7 +20,7 @@ input 'assets/javascripts' do concat files, 'vendor.js' end - match '**/*.coffee' do + match '{app,config,lib}/**/*.coffee' do coffee_script end @@ -49,6 +49,23 @@ input 'assets/javascripts' do end end +# DOH. how to simplify this. +input 'assets/javascripts/spec' do + match 'vendor/*.js' do + files = %w( + vendor/jasmine.js + vendor/jasmine-html.js + vendor/jasmine-runner.js + ) + concat files, 'specs/vendor.js' + end + + match '**/*.coffee' do + coffee_script + concat 'specs/specs.js' + end +end + output 'public/stylesheets' input 'assets/stylesheets' do match '**/*.scss' do @@ -62,9 +79,9 @@ input 'assets/stylesheets' do end end -output 'public' -input 'assets', 'index.html.erb' do - filter(Rake::Pipeline::Web::Filters::TiltFilter) do |input| - input.sub /\.erb$/, '' - end -end +# output 'public' +# input 'assets', 'index.html.erb' do +# filter(Rake::Pipeline::Web::Filters::TiltFilter) do |input| +# input.sub /\\.erb$/, '' +# end +# end diff --git a/assets/javascripts/app/app.coffee b/assets/javascripts/app/app.coffee index c8fd1ac4..32854715 100644 --- a/assets/javascripts/app/app.coffee +++ b/assets/javascripts/app/app.coffee @@ -14,5 +14,3 @@ Travis.store = DS.Store.extend( revision: 4 adapter: Travis.RestAdapter.create() ).create() - -Travis.initialize() diff --git a/assets/javascripts/app/helpers/urls.coffee b/assets/javascripts/app/helpers/urls.coffee index 8ddd1882..45d74704 100644 --- a/assets/javascripts/app/helpers/urls.coffee +++ b/assets/javascripts/app/helpers/urls.coffee @@ -20,12 +20,11 @@ '%@.png'.fmt @get('slug') ).property('slug') - Build: - githubCommit: (-> + Commit: + urlGithubCommit: (-> 'http://github.com/%@/commit/%@'.fmt @getPath('repository.slug'), @getPath('commit.sha') ).property('repository.slug', 'commit.sha') - Commit: urlAuthor: (-> 'mailto:%@'.fmt @getPath('commit.authorEmail') ).property() diff --git a/assets/javascripts/app/templates/builds/list.hbs b/assets/javascripts/app/templates/builds/list.hbs index d13511cf..37836b93 100644 --- a/assets/javascripts/app/templates/builds/list.hbs +++ b/assets/javascripts/app/templates/builds/list.hbs @@ -14,7 +14,7 @@ {{#view Travis.BuildsItemView contextBinding="build"}} {{number}} - {{formatCommit commit}} + {{formatCommit commit}} {{{formatMessage commit.message short="true"}}} {{formatDuration duration}} {{formatTime finished_at}} diff --git a/assets/javascripts/app/templates/repositories/list.hbs b/assets/javascripts/app/templates/repositories/list.hbs index 99d8499f..89f84e60 100644 --- a/assets/javascripts/app/templates/repositories/list.hbs +++ b/assets/javascripts/app/templates/repositories/list.hbs @@ -1,24 +1,22 @@ {{#if content.lastObject.isLoaded}} -