Merge b31df0c into dc12124

googleapis · Jun 30, 2015 · dfa1c10 · dfa1c10
2 parents dc12124 + b31df0c
commit dfa1c10
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/spec/googleauth/get_application_default_spec.rb b/spec/googleauth/get_application_default_spec.rb
@@ -58,7 +58,8 @@
       Dir.mktmpdir do |dir|
         key_path = File.join(dir, 'does-not-exist')
         ENV[@var_name] = key_path
-        expect { Google::Auth.get_application_default(@scope) }.to raise_error
+        expect { Google::Auth.get_application_default(@scope) }
+          .to raise_error RuntimeError
       end
     end
 
@@ -79,7 +80,7 @@
         blk = proc do
           Google::Auth.get_application_default(@scope, connection: c)
         end
-        expect(&blk).to raise_error
+        expect(&blk).to raise_error RuntimeError
       end
       stubs.verify_stubbed_calls
     end

diff --git a/spec/googleauth/service_account_spec.rb b/spec/googleauth/service_account_spec.rb
@@ -182,7 +182,7 @@ def cred_json_text
       Dir.mktmpdir do |dir|
         key_path = File.join(dir, 'does-not-exist')
         ENV[@var_name] = key_path
-        expect { @clz.from_env(@scope) }.to raise_error
+        expect { @clz.from_env(@scope) }.to raise_error RuntimeError
       end
     end
 
@@ -285,7 +285,7 @@ def cred_json_text
       Dir.mktmpdir do |dir|
         key_path = File.join(dir, 'does-not-exist')
         ENV[@var_name] = key_path
-        expect { clz.from_env }.to raise_error
+        expect { clz.from_env }.to raise_error RuntimeError
       end
     end
 

diff --git a/spec/googleauth/user_refresh_spec.rb b/spec/googleauth/user_refresh_spec.rb
@@ -108,7 +108,7 @@ def cred_json_text(missing = nil)
       Dir.mktmpdir do |dir|
         key_path = File.join(dir, 'does-not-exist')
         ENV[@var_name] = key_path
-        expect { @clz.from_env(@scope) }.to raise_error
+        expect { @clz.from_env(@scope) }.to raise_error RuntimeError
       end
     end
 
@@ -120,7 +120,7 @@ def cred_json_text(missing = nil)
           FileUtils.mkdir_p(File.dirname(key_path))
           File.write(key_path, cred_json_text(missing))
           ENV[@var_name] = key_path
-          expect { @clz.from_env(@scope) }.to raise_error
+          expect { @clz.from_env(@scope) }.to raise_error RuntimeError
         end
       end
     end
@@ -170,7 +170,8 @@ def cred_json_text(missing = nil)
           FileUtils.mkdir_p(File.dirname(key_path))
           File.write(key_path, cred_json_text(missing))
           ENV['HOME'] = dir
-          expect { @clz.from_well_known_path(@scope) }.to raise_error
+          expect { @clz.from_well_known_path(@scope) }
+            .to raise_error RuntimeError
         end
       end
     end