Merge branch 'master' into new-enumeration-system

2013-04-01 23:11:37 +02:00
parent 86d53c73a8 31735c4ca7
commit 7cb2c6844f
7 changed files with 120 additions and 3 deletions
--- a/spec/lib/common/browser_spec.rb
+++ b/spec/lib/common/browser_spec.rb
@@ -278,7 +278,7 @@ describe Browser do

  describe '#merge_request_params' do
    let(:params) { {} }
-    let(:default_expectation) { { cache_ttl: 250, headers: { 'User-Agent' => 'SomeUA' } } }
+    let(:default_expectation) { { cache_ttl: 250, headers: { 'User-Agent' => 'SomeUA' }, ssl_verifypeer: false, ssl_verifyhost: 0 } }

    after :each do
      @browser.stub(user_agent: 'SomeUA')