Merge branch 'master' into test-rewrite

Rhys Powell · Rhys Powell · commit 6c5761481ba2 · 2011-11-23T21:16:04.000+11:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,4 @@
-script: "rake spec_lolz && rake cucumber"
+script: "rake spec && rake cucumber"
 rvm: 1.9.2
 notifications:
   irc: "irc.freenode.org#hacketyhack"
diff --git a/README.md b/README.md
@@ -1,5 +1,7 @@
 # hackety-hack.com
 
+[![Build status](https://secure.travis-ci.org/hacketyhack/hackety-hack.com.png)](http://travis-ci.org/#!/hacketyhack/hackety-hack.com)
+
 This is the source code for hackety-hack.com.
 
 At the moment, we're re-building it for Rails 3. So there's not a lot of docs. Sorry about that!
diff --git a/lib/tasks/rspec.rake b/lib/tasks/rspec.rake
@@ -1,4 +1,6 @@
-RSpec::Core::RakeTask.new(:spec_lolz) do |spec|
-  spec.rspec_opts = ["-r./spec/spec_helper.rb"]
+Rake.application.instance_variable_get('@tasks').delete('spec')
+
+RSpec::Core::RakeTask.new(:spec) do |task|
+  task.rspec_opts = ["-r./spec/spec_helper.rb"]
 end
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-script: "rake spec_lolz && rake cucumber"`
	`1`	`+script: "rake spec && rake cucumber"`
`2`	`2`	`rvm: 1.9.2`
`3`	`3`	`notifications:`
`4`	`4`	`irc: "irc.freenode.org#hacketyhack"`