0.2.32

Fix Ruby 1.9 RSpec test failures introduced in release 0.2.31
bbc-frameworks · Nov 19, 2013 · f6dbc85 · f6dbc85
1 parent 0b28796
commit f6dbc85
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,6 @@
+0.2.32
+Fix Ruby 1.9 RSpec test failures introduced in release 0.2.31
+
 0.2.31
 Added Firefox profile certificate handling via the FIREFOX_CERT_PATH and FIREFOX_CERT_PREFIX variables.
 

diff --git a/lib/version.rb b/lib/version.rb
@@ -1,3 +1,3 @@
 module FrameworksCapybara
-  VERSION = '0.2.31'
+  VERSION = '0.2.32'
 end
diff --git a/spec/frameworks_capybara_spec.rb b/spec/frameworks_capybara_spec.rb
@@ -544,11 +544,9 @@ def compare_file_data(profile_path, file_name, expected_data)
             secmod_data = write_random_data(@secmod_db)
 
             setup = CapybaraSetup.new
-            result = nil
-            setup.instance_exec(profile, @cert_dir, result) { |profile, certificate_path, result|
-              result = update_firefox_profile_with_certificates(profile, certificate_path) 
+            result = setup.instance_exec(profile, @cert_dir) { |profile, certificate_path|
+              update_firefox_profile_with_certificates(profile, certificate_path) 
             }
-
             profile_path = result.layout_on_disk
             compare_file_data(profile_path, 'cert8.db', cert8_data)
             compare_file_data(profile_path, 'key3.db', key3_data)
@@ -568,11 +566,9 @@ def compare_file_data(profile_path, file_name, expected_data)
             secmod_data = write_random_data(@secmod_db)
 
             setup = CapybaraSetup.new
-            result = nil
-            setup.instance_exec(profile, @cert_dir, cert_prefix, result) { |profile, certificate_path, certificate_prefix, result|
-              result = update_firefox_profile_with_certificates(profile, certificate_path, certificate_prefix) 
+            result = setup.instance_exec(profile, @cert_dir, cert_prefix) { |profile, certificate_path, certificate_prefix, result|
+              update_firefox_profile_with_certificates(profile, certificate_path, certificate_prefix) 
             }
-
             profile_path = result.layout_on_disk
             compare_file_data(profile_path, 'cert8.db', cert8_data)
             compare_file_data(profile_path, 'key3.db', key3_data)