Merge pull request #2516 from rthbound/patching_specs

Kills whitespace
Subject-verb agreement fixes
mri -> MRI

8 files changed, 19 insertions, 23 deletions

diff --git a/spec/install/security_policy_spec.rb b/spec/install/security_policy_spec.rb
index c0cadcf9ba..941e14de27 100644
--- a/spec/install/security_policy_spec.rb
+++ b/spec/install/security_policy_spec.rb
@@ -14,37 +14,37 @@ describe "policies with unsigned gems" do
     G
   end
 
-  it "works after you try to deploy without a lock" do
+  it "will work after you try to deploy without a lock" do
     bundle "install --deployment"
     bundle :install, :exitstatus => true
     expect(exitstatus).to eq(0)
     should_be_installed "rack 1.0", "signed_gem 1.0"
   end
 
-  it "fails when given invalid security policy" do
+  it "will fail when given invalid security policy" do
     bundle "install --trust-policy=InvalidPolicyName"
     expect(out).to include("Rubygems doesn't know about trust policy")
   end
 
-  it "fails with High Security setting due to presence of unsigned gem" do
+  it "will fail with High Security setting due to presence of unsigned gem" do
     bundle "install --trust-policy=HighSecurity"
     expect(out).to include("security policy didn't allow")
   end
 
   # This spec will fail on Rubygems 2 rc1 due to a bug in policy.rb. the bug is fixed in rc3.
-  it "fails with Medium Security setting due to presence of unsigned gem", :unless => ENV['RGV'] == "v2.0.0.rc.1" do
+  it "will fail with Medium Security setting due to presence of unsigned gem", :unless => ENV['RGV'] == "v2.0.0.rc.1" do
     bundle "install --trust-policy=MediumSecurity"
     expect(out).to include("security policy didn't allow")
   end
 
-  it "succeeds with no policy" do
+  it "will succeed with no policy" do
     bundle "install", :exitstatus => true
     expect(exitstatus).to eq(0)
   end
 
 end
 
-describe "policies with signed gems, no CA" do
+describe "policies with signed gems and no CA" do
   before do
     build_security_repo
     gemfile <<-G
@@ -53,26 +53,25 @@ describe "policies with signed gems, no CA" do
     G
   end
 
-  it "fails with High Security setting, gem is self-signed" do
+  it "will fail with High Security setting, gem is self-signed" do
     bundle "install --trust-policy=HighSecurity"
     expect(out).to include("security policy didn't allow")
   end
 
-  it "fails with Medium Security setting, gem is self-signed" do
+  it "will fail with Medium Security setting, gem is self-signed" do
     bundle "install --trust-policy=MediumSecurity"
     expect(out).to include("security policy didn't allow")
   end
 
-  it "succeeds with Low Security setting, low security accepts self signed gem" do
+  it "will succeed with Low Security setting, low security accepts self signed gem" do
     bundle "install --trust-policy=LowSecurity", :exitstatus => true
     expect(exitstatus).to eq(0)
     should_be_installed "signed_gem 1.0"
   end
 
-  it "succeeds with no policy" do
+  it "will succeed with no policy" do
     bundle "install", :exitstatus => true
     expect(exitstatus).to eq(0)
     should_be_installed "signed_gem 1.0"
   end
-
 end
diff --git a/spec/integration/inject.rb b/spec/integration/inject.rb
index f7ffff6083..2737b1a4c7 100644
--- a/spec/integration/inject.rb
+++ b/spec/integration/inject.rb
@@ -21,7 +21,7 @@ describe "bundle inject" do
       bundle "install"
     end
 
-    it "adds the injected gems to the gemfile" do
+    it "adds the injected gems to the Gemfile" do
       expect(bundled_app("Gemfile").read).not_to match(/rack-obama/)
       bundle "inject 'rack-obama' '> 0'"
       expect(bundled_app("Gemfile").read).to match(/rack-obama/)
diff --git a/spec/lock/git_spec.rb b/spec/lock/git_spec.rb
index 23b7f3112c..9d4ecf9bc7 100644
--- a/spec/lock/git_spec.rb
+++ b/spec/lock/git_spec.rb
@@ -31,5 +31,4 @@ describe "bundle lock with git gems" do
     RUBY
     expect(out).to eq(bundle("show foo"))
   end
-
 end
diff --git a/spec/lock/lockfile_spec.rb b/spec/lock/lockfile_spec.rb
index 30c4b22483..ddaa77f8cf 100644
--- a/spec/lock/lockfile_spec.rb
+++ b/spec/lock/lockfile_spec.rb
@@ -292,7 +292,7 @@ describe "the lockfile format" do
     G
   end
 
-  it "order dependencies of dependencies in alphabetical order" do
+  it "orders dependencies' dependencies in alphabetical order" do
     install_gemfile <<-G
       source "file://#{gem_repo1}"
 
@@ -328,7 +328,7 @@ describe "the lockfile format" do
     G
   end
 
-  it "orders dependencies according to version" do
+  it "orders dependencies by version" do
     install_gemfile <<-G
       source "file://#{gem_repo1}"
       gem 'double_deps'
@@ -638,7 +638,7 @@ describe "the lockfile format" do
   end
 
 
-  it "raises if two different versions are used" do
+  it "raises if two different sources are used" do
     install_gemfile <<-G
       source "file://#{gem_repo1}"
       gem "rack"
@@ -676,7 +676,7 @@ describe "the lockfile format" do
   # * multiple copies of the same GIT section appeared in the lockfile
   # * when this happened, those sections got multiple copies of gems
   #   in those sections.
-  it "fix corrupted lockfiles" do
+  it "fixes corrupted lockfiles" do
     build_git "omg", :path => lib_path('omg')
     revision = revision_for(lib_path('omg'))
 
@@ -740,7 +740,7 @@ describe "the lockfile format" do
     L
   end
 
-  describe "line endings" do
+  describe "a line ending" do
     def set_lockfile_mtime_to_known_value
       time = Time.local(2000, 1, 1, 0, 0, 0)
       File.utime(time, time, bundled_app('Gemfile.lock'))
diff --git a/spec/other/platform_spec.rb b/spec/other/platform_spec.rb
index f0329a53e9..4efac30e8e 100644
--- a/spec/other/platform_spec.rb
+++ b/spec/other/platform_spec.rb
@@ -81,7 +81,7 @@ G
       expect(out).to eq("ruby 1.9.3")
     end
 
-    it "engine defaults to MRI" do
+    it "defaults to MRI" do
       gemfile <<-G
         source "file://#{gem_repo1}"
         ruby "1.9.3"
@@ -146,7 +146,7 @@ G
       expect(exitstatus).not_to eq(0)
     end
 
-    it "raises an error if engine version doesn't match ruby version for mri" do
+    it "raises an error if engine version doesn't match ruby version for MRI" do
       gemfile <<-G
         source "file://#{gem_repo1}"
         ruby "1.8.7", :engine => 'ruby', :engine_version => '1.2.4'
diff --git a/spec/realworld/dependency_api_spec.rb b/spec/realworld/dependency_api_spec.rb
index ad4756c2f6..3d773d57fa 100644
--- a/spec/realworld/dependency_api_spec.rb
+++ b/spec/realworld/dependency_api_spec.rb
@@ -57,5 +57,4 @@ describe "gemcutter's dependency API", :realworld => true do
       should_be_installed "rack 1.0.0"
     end
   end
-
 end
diff --git a/spec/resolver/basic_spec.rb b/spec/resolver/basic_spec.rb
index 6371dc518b..d675f4435f 100644
--- a/spec/resolver/basic_spec.rb
+++ b/spec/resolver/basic_spec.rb
@@ -18,7 +18,7 @@ describe "Resolving" do
     should_resolve_as %w(actionpack-2.3.5 activesupport-2.3.5 rack-1.0)
   end
 
-  it "resolve a conflicting index" do
+  it "resolves a conflicting index" do
     @index = a_conflict_index
     dep "my_app"
     should_resolve_as %w(activemodel-3.2.11 builder-3.0.4 grape-0.2.6 my_app-1.0.0)
diff --git a/spec/runtime/with_clean_env_spec.rb b/spec/runtime/with_clean_env_spec.rb
index 7a77db0b4d..193a6e5b0c 100644
--- a/spec/runtime/with_clean_env_spec.rb
+++ b/spec/runtime/with_clean_env_spec.rb
@@ -88,5 +88,4 @@ describe "Bundler.with_env helpers" do
       expect($?.exitstatus).to eq(42)
     end
   end
-
 end