🐞 Space: SpacesController#show works with BYODomain (#1178)

- #74 I introduced this bug in b65a233, basically the `SpaceController#show` was not finding by domain, so it would give an empty page. This also adds support for using [`assert_select`](http://api.rubyonrails.org/classes/ActionDispatch/IntegrationTest.html) in request specs, so long as the `subject` is a `TestResponse`.
zinc-collective · Mar 3, 2023 · 5313039 · 5313039
1 parent 9bc9704
commit 5313039
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 6 deletions.
diff --git a/app/controllers/spaces_controller.rb b/app/controllers/spaces_controller.rb
@@ -60,6 +60,8 @@ def space_params
       policy_scope(Space).friendly.find(params[:id])
     elsif params[:space]
       policy_scope(Space).new(space_params)
+    elsif BrandedDomainConstraint.new(space_repository).space_for_request(request).present?
+      BrandedDomainConstraint.new(space_repository).space_for_request(request)
     else
       policy_scope(Space).new
     end.tap do |space|

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -12,7 +12,7 @@
   <body>
     <%= render 'layouts/header' %>
 
-    <main>
+    <main id="<%= current_space.present? ? dom_id(current_space) : nil %>">
       <%= yield %>
     </main>
 

diff --git a/app/views/spaces/show.html.erb b/app/views/spaces/show.html.erb
@@ -2,4 +2,4 @@
 
 <%- if space.entrance.present? %>
   <%= render space.entrance %>
-<%- end %>
+<%- end %>
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
@@ -63,6 +63,7 @@
   # config.filter_gems_from_backtrace("gem name")
 
   config.include(AuthHelpers, type: :request)
+  config.include(DomHelpers, type: :request)
 
   config.include ViewComponent::TestHelpers, type: :component
 end

diff --git a/spec/requests/spaces_controller_request_spec.rb b/spec/requests/spaces_controller_request_spec.rb
@@ -2,17 +2,38 @@
 
 require "swagger_helper"
 
-RSpec.describe SpacesController, type: :request do
+RSpec.describe SpacesController do
   include ActiveJob::TestHelper
 
   describe "#show" do
+    subject(:perform_request) do
+      get url
+      test_response
+    end
+
+    let(:space) { create(:space) }
+    let(:url) { polymorphic_url(space) }
+
+    it { is_expected.to be_ok }
+    specify { perform_request && assert_select("##{dom_id(space)}") }
+
     context "with a branded domain" do
       let(:space) { create(:space, branded_domain: "beta.example.com") }
 
-      it "redirects to the domain" do
-        get polymorphic_path(space)
+      context "when accessing via the neighborhood url" do
+        it { is_expected.to redirect_to "http://beta.example.com" }
+      end
+
+      context "when accessing via domain" do
+        before do
+          space
+          host! "beta.example.com"
+        end
+
+        let(:url) { "http://beta.example.com" }
 
-        expect(response).to redirect_to "http://beta.example.com"
+        it { is_expected.to be_ok }
+        specify { perform_request && assert_select("##{dom_id(space)}") }
       end
     end
   end

diff --git a/spec/support/dom_helpers.rb b/spec/support/dom_helpers.rb
@@ -0,0 +1,16 @@
+module DomHelpers
+  def record_identifier
+    ActionView::RecordIdentifier
+  end
+  delegate :dom_id, to: :record_identifier
+
+  def test_response
+    TestResponse.new(response)
+  end
+
+  class TestResponse < SimpleDelegator
+    def media_type?(expected_media_type)
+      media_type == Mime[expected_media_type]
+    end
+  end
+end
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,7 +12,7 @@ @@
       <body>
         <%= render 'layouts/header' %>
-        <main>
+        <main id="<%= current_space.present? ? dom_id(current_space) : nil %>">
           <%= yield %>
         </main>
@@ Expand Down @@