Skip to content
Browse files

Merge commit 'cb60486882fbbda7462c239aef12a7bb8230093e'

  • Loading branch information...
2 parents f0def29 + cb60486 commit a628d6b80f3091e6c5b5f1437e8fea65e49fc1e8 @cypher cypher committed
Showing with 9 additions and 9 deletions.
  1. +9 −9 spec/thor_runner_spec.rb
View
18 spec/thor_runner_spec.rb
@@ -92,15 +92,15 @@ class ThorTask2 < Thor
proc { Thor::Runner.start }.must raise_error(NoMethodError)
end
-# it "presents tasks in the default namespace with an empty namespace" do
-# ARGV.replace ["list"]
-# capture(:stdout) { Thor::Runner.start }.must =~ /^:test +prints 'test'/
-# end
-
-# it "runs tasks with an empty namespace from the default namespace" do
-# ARGV.replace [":test"]
-# capture(:stdout) { Thor::Runner.start }.must == "test\n"
-# end
+ it "presents tasks in the default namespace with an empty namespace" do
+ ARGV.replace ["list"]
+ capture(:stdout) { Thor::Runner.start }.must =~ /^:test +prints 'test'/
+ end
+
+ it "runs tasks with an empty namespace from the default namespace" do
+ ARGV.replace [":test"]
+ capture(:stdout) { Thor::Runner.start }.must == "test\n"
+ end
end
describe Thor::Runner, " install" do

2 comments on commit a628d6b

@nex3

You know, you can run git rebase origin/master before pushing to get rid of all these merge commits.

@cypher

Even if I merge commits from another remote?

Although now that you mention it, I could’ve used rebase --onto. Sorry, I’ll remember it next time.

Please sign in to comment.
Something went wrong with that request. Please try again.