Skip to content

Commit

Permalink
try using jasmine for specs
Browse files Browse the repository at this point in the history
  • Loading branch information
Sven Fuchs committed Jun 25, 2012
1 parent 2af55e9 commit cc49b87
Show file tree
Hide file tree
Showing 25 changed files with 15,274 additions and 4,537 deletions.
31 changes: 24 additions & 7 deletions AssetFile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand All @@ -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
2 changes: 0 additions & 2 deletions assets/javascripts/app/app.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,3 @@ Travis.store = DS.Store.extend(
revision: 4
adapter: Travis.RestAdapter.create()
).create()

Travis.initialize()
5 changes: 2 additions & 3 deletions assets/javascripts/app/helpers/urls.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion assets/javascripts/app/templates/builds/list.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
{{#view Travis.BuildsItemView contextBinding="build"}}
<tr>
<td class="number"><a {{action viewBuild href=true}}>{{number}}</a></td>
<td class="commit"><a {{bindAttr href="urlGithubCommit"}}>{{formatCommit commit}}</a></td>
<td class="commit"><a {{bindAttr href="view.urlGithubCommit"}}>{{formatCommit commit}}</a></td>
<td class="message">{{{formatMessage commit.message short="true"}}}</td>
<td class="duration" {{bindAttr title="started_at"}}>{{formatDuration duration}}</td>
<td class="finished_at timeago" {{bindAttr title="finished_at"}}>{{formatTime finished_at}}</td>
Expand Down
34 changes: 16 additions & 18 deletions assets/javascripts/app/templates/repositories/list.hbs
Original file line number Diff line number Diff line change
@@ -1,24 +1,22 @@
{{#if content.lastObject.isLoaded}}
<ul>
<ul id="repositories">
{{#each repository in content}}
{{#view Travis.RepositoriesItemView contextBinding="repository"}}
<li {{bindAttr class="view.classes"}}>
<div class="wrapper">
<a {{action viewCurrent href=true}} class="slug">{{slug}}</a>
<a {{action viewBuild href=true context="lastBuild"}} class="build">#{{lastBuildNumber}}</a>
</div>
{{#view Travis.RepositoriesItemView tagName="li" classBinding="classes" contextBinding="repository"}}
<div class="wrapper">
<a {{action viewCurrent href=true}} class="slug">{{slug}}</a>
<a {{action viewBuild href=true context="lastBuild"}} class="build">#{{lastBuildNumber}}</a>
</div>

<p class="summary">
<span class="duration_label">{{t repositories.duration}}:</span>
<abbr class="duration" {{bindAttr title="lastBuildStartedAt"}}>{{formatDuration lastBuildDuration}}</abbr>,
<span class="finished_at_label">{{t repositories.finished_at}}:</span>
<abbr class="finished_at timeago" {{bindAttr title="lastBuildFinishedAt"}}>{{formatTime lastBuildFinished_at}}</abbr>
</p>
{{#if description}}
<p class="description">{{description}}</p>
{{/if}}
<span class="indicator"></span>
</li>
<p class="summary">
<span class="duration_label">{{t repositories.duration}}:</span>
<abbr class="duration" {{bindAttr title="lastBuildStartedAt"}}>{{formatDuration lastBuildDuration}}</abbr>,
<span class="finished_at_label">{{t repositories.finished_at}}:</span>
<abbr class="finished_at timeago" {{bindAttr title="lastBuildFinishedAt"}}>{{formatTime lastBuildFinished_at}}</abbr>
</p>
{{#if description}}
<p class="description">{{description}}</p>
{{/if}}
<span class="indicator"></span>
{{/view}}
{{/each}}
<ul>
Expand Down
5 changes: 0 additions & 5 deletions assets/javascripts/spec/foo.spec.js

This file was deleted.

14 changes: 14 additions & 0 deletions assets/javascripts/spec/foo_spec.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
describe 'Foo', ->
it 'bar', ->
console.log('before spec')
link = $($('#repositories a.slug')[0])
console.log $('body').html().toString()
# link.attr('href').should.equal '#/travis-ci/travis-core'
console.log('after spec')

it 'bar', ->
console.log('before spec')
link = $($('#repositories a.slug')[0])
# link.attr('href').should.equal '#/travis-ci/travis-core'
console.log('after spec')

11 changes: 11 additions & 0 deletions assets/javascripts/spec/spec_helper.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
minispade.require 'app'

$('body').append($('<div id="spec_content"></div>'))
Travis.rootElement = '#spec_content'

# beforeEach ->
# $('body #spec_content').empty()
# Travis.initialize()

# afterEach ->
#
23 changes: 0 additions & 23 deletions assets/javascripts/spec/support/index.html

This file was deleted.

Loading

0 comments on commit cc49b87

Please sign in to comment.