1 files changed, 10 insertions, 10 deletions
diff --git a/spec/install/gems/platform_spec.rb b/spec/install/gems/platform_spec.rb
index b604bc1d7f..a5a00342aa 100644
--- a/spec/install/gems/platform_spec.rb
+++ b/spec/install/gems/platform_spec.rb
@@ -30,8 +30,8 @@ describe "bundle install across platforms" do
         remote: file:#{gem_repo1}
         specs:
           platform_specific (1.0)
-          platform_specific (1.0-java)
-          platform_specific (1.0-x86-mswin32)
+          platform_specific (1.0-#{java})
+          platform_specific (1.0-#{mswin})
 
       PLATFORMS
         ruby
@@ -40,25 +40,25 @@ describe "bundle install across platforms" do
         platform_specific
     G
 
-    simulate_platform "java"
+    simulate_platform java
     install_gemfile <<-G
       source "file://#{gem_repo1}"
 
       gem "platform_specific"
     G
 
-    should_be_installed "platform_specific 1.0 JAVA"
+    should_be_installed "platform_specific 1.0 #{java}", :check_platform => true
   end
 
   it "works with gems that have different dependencies" do
-    simulate_platform "java"
+    simulate_platform java
     install_gemfile <<-G
       source "file://#{gem_repo1}"
 
       gem "nokogiri"
     G
 
-    should_be_installed "nokogiri 1.4.2 JAVA", "weakling 0.0.3"
+    should_be_installed "nokogiri 1.4.2 #{java}", "weakling 0.0.3 ruby", :gemspec_count => 2, :check_platform => true
 
     simulate_new_machine
 
@@ -74,17 +74,17 @@ describe "bundle install across platforms" do
   end
 
   it "works the other way with gems that have different dependencies" do
-    simulate_platform "ruby"
+    simulate_platform 'ruby'
     install_gemfile <<-G
       source "file://#{gem_repo1}"
 
       gem "nokogiri"
     G
 
-    simulate_platform "java"
+    simulate_platform java
     bundle "install"
 
-    should_be_installed "nokogiri 1.4.2 JAVA", "weakling 0.0.3"
+    should_be_installed "nokogiri 1.4.2 #{java}", "weakling 0.0.3 ruby", :gemspec_count => 2, :check_platform => true
   end
 
   it "fetches gems again after changing the version of Ruby" do
@@ -181,7 +181,7 @@ describe "bundle install with platform conditionals" do
 
     install_gemfile <<-G
       platform :#{not_local_tag} do
-        gem "foo", :git => "#{lib_path('foo-1.0')}"
+        gem "foo", :git => "file://#{lib_path('foo-1.0')}/.git"
       end
     G