Reorder SLO disabled specs

Author: gerardo-navarro

lib/omniauth/strategies/saml.rb

@@ -74,8 +74,12 @@ def other_phase
           if on_subpath?(:metadata)
             other_phase_for_metadata
           elsif on_subpath?(:slo)
+            return slo_disabled_response unless slo_enabled?
+
             other_phase_for_slo
           elsif on_subpath?(:spslo)
+            return slo_disabled_response unless slo_enabled?
+
             other_phase_for_spslo
           else
             call_app!

spec/omniauth/strategies/saml_spec.rb

@@ -276,10 +276,6 @@ def post_xml(xml = :example_response, opts = {})
     end
 
     context "when response is a logout response" do
-      before do
-        saml_options[:slo_enabled] = true
-      end
-
       before :each do
         post "/auth/saml/slo", {
           SAMLResponse: load_xml(:example_logout_response),
@@ -336,13 +332,21 @@ def post_xml(xml = :example_response, opts = {})
         end
       end
     end
-  end
 
-  describe 'POST /auth/saml/spslo' do
-    before do
-      saml_options[:slo_enabled] = true
+    context "when SLO is disabled" do
+      before do
+        saml_options[:slo_enabled] = false
+        post "/auth/saml/slo"
+      end
+
+      it "should return not implemented" do
+        expect(last_response.status).to eq 501
+        expect(last_response.body).to eq "Not Implemented"
+      end
     end
+  end
 
+  describe 'POST /auth/saml/spslo' do
     def test_default_relay_state(static_default_relay_state = nil, &block_default_relay_state)
       saml_options["slo_default_relay_state"] = static_default_relay_state || block_default_relay_state
       post "/auth/saml/spslo"
@@ -375,6 +379,18 @@ def test_default_relay_state(static_default_relay_state = nil, &block_default_re
       expect(last_response.status).to eq 501
       expect(last_response.body).to match /Not Implemented/
     end
+
+    context "when SLO is disabled" do
+      before do
+        saml_options[:slo_enabled] = false
+        post "/auth/saml/spslo"
+      end
+
+      it "should return not implemented" do
+        expect(last_response.status).to eq 501
+        expect(last_response.body).to eq "Not Implemented"
+      end
+    end
   end
 
   describe 'POST /auth/saml/metadata' do