Merge pull request #347 from rthbound/patch-10

Patch 10 - Improves on readability of specs

Author: sferik

spec/actions/directory_spec.rb

@@ -74,7 +74,7 @@ def exists_and_identical?(source_path, destination_path)
       expect(File.exists?(file)).to be_false
     end
 
-    it "copies and evalutes files within excluding/ directory when no exclude_pattern is present" do
+    it "copies and evaluates files within excluding/ directory when no exclude_pattern is present" do
       invoke! "doc", "docs"
       file = File.join(destination_root, "docs", "excluding", "rdoc.rb")
       expect(File.exists?(file)).to be_true
@@ -95,7 +95,7 @@ def exists_and_identical?(source_path, destination_path)
       expect(File.read(file)).to eq("FOO = FOO\n")
     end
 
-    it "copies directories and preserved file mode" do
+    it "copies directories and preserves file mode" do
       invoke! "preserve", "preserved", :mode => :preserve
       original = File.join(source_root, "preserve", "script.sh")
       copy = File.join(destination_root, "preserved", "script.sh")

spec/actions/file_manipulation_spec.rb

@@ -33,7 +33,7 @@ def file
       action :chmod, "foo", 0755
     end
 
-    it "does not execute the command if pretending given" do
+    it "does not execute the command if pretending" do
       FileUtils.should_not_receive(:chmod_R)
       runner(:pretend => true)
       action :chmod, "foo", 0755

spec/actions/inject_into_file_spec.rb

@@ -56,7 +56,7 @@ def file
       expect(File.read(file)).to eq("__start__\nREADME\n__end__\n")
     end
 
-    it "does not change the file if already include content" do
+    it "does not change the file if already includes content" do
       invoke! "doc/README", :before => "__end__" do
         "more content\n"
       end
@@ -70,7 +70,7 @@ def file
       expect(File.read(file)).to eq("__start__\nREADME\nmore content\n__end__\n")
     end
 
-    it "does change the file if already include content and :force == true" do
+    it "does change the file if already includes content and :force is true" do
       invoke! "doc/README", :before => "__end__" do
         "more content\n"
       end
@@ -87,26 +87,26 @@ def file
   end
 
   describe "#revoke!" do
-    it "substracts the destination file after injection" do
+    it "subtracts the destination file after injection" do
       invoke! "doc/README", "\nmore content", :after => "__start__"
       revoke! "doc/README", "\nmore content", :after => "__start__"
       expect(File.read(file)).to eq("__start__\nREADME\n__end__\n")
     end
 
-    it "substracts the destination file before injection" do
+    it "subtracts the destination file before injection" do
       invoke! "doc/README", "more content\n", :before => "__start__"
       revoke! "doc/README", "more content\n", :before => "__start__"
       expect(File.read(file)).to eq("__start__\nREADME\n__end__\n")
     end
 
-    it "substracts even with double after injection" do
+    it "subtracts even with double after injection" do
       invoke! "doc/README", "\nmore content", :after => "__start__"
       invoke! "doc/README", "\nanother stuff", :after => "__start__"
       revoke! "doc/README", "\nmore content", :after => "__start__"
       expect(File.read(file)).to eq("__start__\nanother stuff\nREADME\n__end__\n")
     end
 
-    it "substracts even with double before injection" do
+    it "subtracts even with double before injection" do
       invoke! "doc/README", "more content\n", :before => "__start__"
       invoke! "doc/README", "another stuff\n", :before => "__start__"
       revoke! "doc/README", "more content\n", :before => "__start__"
@@ -120,7 +120,7 @@ def file
       expect(File.read(file)).to eq("another stuff\n__start__\nREADME\n__end__\n")
     end
 
-    it "substracts when appending" do
+    it "subtracts when appending" do
       invoke! "doc/README", "more content\n", :before => /\z/
       invoke! "doc/README", "another stuff\n", :before => /\z/
       revoke! "doc/README", "more content\n", :before => /\z/

spec/parser/argument_spec.rb

@@ -20,7 +20,7 @@ def argument(name, options={})
       }.to raise_error(ArgumentError, "Type :unknown is not valid for arguments.")
     end
 
-    it "raises an error if argument is required and have default values" do
+    it "raises an error if argument is required and has default values" do
       expect {
         argument(:command, :type => :string, :default => "bar", :required => true)
       }.to raise_error(ArgumentError, "An argument cannot be required and have default value.")

spec/shell/basic_spec.rb

@@ -109,7 +109,7 @@ def shell
       shell.say_status(:create, "~/.thor/command.thor")
     end
 
-    it "always use new line" do
+    it "always uses new line" do
       $stdout.should_receive(:puts).with("      create  ")
       shell.say_status(:create, "")
     end
@@ -137,7 +137,7 @@ def shell
       shell.say_status(:created, "~/.thor/command.thor", false)
     end
 
-    it "uses padding to set messages left margin" do
+    it "uses padding to set message's left margin" do
       shell.padding = 2
       $stdout.should_receive(:puts).with("      create      ~/.thor/command.thor")
       shell.say_status(:create, "~/.thor/command.thor")
@@ -259,33 +259,33 @@ def  #456  Lanç...
       shell.file_collision('foo')
     end
 
-    it "returns true if the user choose default option" do
+    it "returns true if the user chooses default option" do
       $stdout.stub!(:print)
       $stdin.should_receive(:gets).and_return('')
       expect(shell.file_collision('foo')).to be_true
     end
 
-    it "returns false if the user choose no" do
+    it "returns false if the user chooses no" do
       $stdout.stub!(:print)
       $stdin.should_receive(:gets).and_return('n')
       expect(shell.file_collision('foo')).to be_false
     end
 
-    it "returns true if the user choose yes" do
+    it "returns true if the user chooses yes" do
       $stdout.stub!(:print)
       $stdin.should_receive(:gets).and_return('y')
       expect(shell.file_collision('foo')).to be_true
     end
 
-    it "shows help usage if the user choose help" do
+    it "shows help usage if the user chooses help" do
       $stdout.stub!(:print)
       $stdin.should_receive(:gets).and_return('h')
       $stdin.should_receive(:gets).and_return('n')
       help = capture(:stdout) { shell.file_collision('foo') }
       expect(help).to match(/h \- help, show this help/)
     end
 
-    it "quits if the user choose quit" do
+    it "quits if the user chooses quit" do
       $stdout.stub!(:print)
       $stdout.should_receive(:puts).with('Aborting...')
       $stdin.should_receive(:gets).and_return('q')
@@ -295,7 +295,7 @@ def  #456  Lanç...
       }.to raise_error(SystemExit)
     end
 
-    it "always returns true if the user choose always" do
+    it "always returns true if the user chooses always" do
       $stdout.should_receive(:print).with('Overwrite foo? (enter "h" for help) [Ynaqh] ')
       $stdin.should_receive(:gets).and_return('a')
 

spec/shell/html_spec.rb

@@ -6,7 +6,7 @@ def shell
   end
 
   describe "#say" do
-    it "set the color if specified" do
+    it "sets the color if specified" do
       out = capture(:stdout) { shell.say "Wow! Now we have colors!", :green }
       expect(out.chomp).to eq('<span style="color: green;">Wow! Now we have colors!</span>')
     end