From 4a75394499104a992e78e177253876c12c18ace4 Mon Sep 17 00:00:00 2001 From: Zachary Scott Date: Tue, 26 Jul 2016 15:41:56 +0900 Subject: [PATCH] Update rspec syntax from #75 --- .../spec/content_security_policy_spec.rb | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/rack-protection/spec/content_security_policy_spec.rb b/rack-protection/spec/content_security_policy_spec.rb index 491c8992..57d43c2b 100644 --- a/rack-protection/spec/content_security_policy_spec.rb +++ b/rack-protection/spec/content_security_policy_spec.rb @@ -4,13 +4,15 @@ describe Rack::Protection::ContentSecurityPolicy do it_behaves_like "any rack application" it 'should set the Content Security Policy' do - get('/', {}, 'wants' => 'text/html').headers["Content-Security-Policy"].should == "default-src none; script-src self; connect-src self; style-src self" + expect( + get('/', {}, 'wants' => 'text/html').headers["Content-Security-Policy"] + ).to eq("default-src none; script-src self; connect-src self; style-src self") end it 'should not set the Content Security Policy for other content types' do headers = get('/', {}, 'wants' => 'text/foo').headers - headers["Content-Security-Policy"].should be_nil - headers["Content-Security-Policy-Report-Only"].should be_nil + expect(headers["Content-Security-Policy"]).to be_nil + expect(headers["Content-Security-Policy-Report-Only"]).to be_nil end it 'should allow changing the protection settings' do @@ -21,8 +23,8 @@ describe Rack::Protection::ContentSecurityPolicy do end headers = get('/', {}, 'wants' => 'text/html').headers - headers["Content-Security-Policy"].should == "default-src none; script-src https://cdn.mybank.net; connect-src https://api.mybank.com; font-src https://cdn.mybank.net; frame-src self; media-src https://cdn.mybank.net; style-src https://cdn.mybank.net; object-src https://cdn.mybank.net; report-uri /my_amazing_csp_report_parser; sandbox allow-scripts" - headers["Content-Security-Policy-Report-Only"].should be_nil + expect(headers["Content-Security-Policy"]).to eq("default-src none; script-src https://cdn.mybank.net; connect-src https://api.mybank.com; font-src https://cdn.mybank.net; frame-src self; media-src https://cdn.mybank.net; style-src https://cdn.mybank.net; object-src https://cdn.mybank.net; report-uri /my_amazing_csp_report_parser; sandbox allow-scripts") + expect(headers["Content-Security-Policy-Report-Only"]).to be_nil end it 'should allow changing report only' do @@ -33,12 +35,12 @@ describe Rack::Protection::ContentSecurityPolicy do end headers = get('/', {}, 'wants' => 'text/html').headers - headers["Content-Security-Policy"].should be_nil - headers["Content-Security-Policy-Report-Only"].should == "default-src none; script-src self; connect-src self; style-src self; report-uri /my_amazing_csp_report_parser" + expect(headers["Content-Security-Policy"]).to be_nil + expect(headers["Content-Security-Policy-Report-Only"]).to eq("default-src none; script-src self; connect-src self; style-src self; report-uri /my_amazing_csp_report_parser") end it 'should not override the header if already set' do mock_app with_headers("Content-Security-Policy" => "default-src: none") - get('/', {}, 'wants' => 'text/html').headers["Content-Security-Policy"].should == "default-src: none" + expect(get('/', {}, 'wants' => 'text/html').headers["Content-Security-Policy"]).to eq("default-src: none") end end