Chore immersive fix

Gemfile

@@ -40,3 +40,6 @@ group :development, :test do
   gem 'teaspoon-jasmine'
   gem 'selenium-webdriver'
 end
+
+gem 'mumuki-domain', github: 'mumuki/mumuki-domain', branch: 'chore-retenantize'
+gem 'mumukit-platform', github: 'mumuki/mumukit-platform', branch: 'chore-untenantize'

app/controllers/application_controller.rb

@@ -91,18 +91,14 @@ def current_immersive_path(context)
   end
 
   def current_immersive_path_for(context, content)
-    resource = content ? polymorphic_path(content) : default_immersive_path_for(context)
-    context.url_for resource
+    resource_path = content ? polymorphic_path(content) : default_immersive_path_for(context)
+    context.retenantized_url_for(resource_path)
   end
 
   private
 
   def default_immersive_path_for(context)
-    subject.present? ? root_path : inorganic_path_for(request)
-  end
-
-  def inorganic_path_for(request)
-    Mumukit::Platform.organization_mapping.inorganic_path_for(request)
+    subject.present? ? root_path : request.path_info
   end
 
   def current_immersive_context

lib/mumuki/laboratory.rb

@@ -29,32 +29,6 @@ class Mumuki::Laboratory::Engine < ::Rails::Engine
   config.i18n.available_locales = Mumukit::Platform::Locale.supported
 end
 
-module Mumukit::Platform::OrganizationMapping::Path
-  class << self
-    alias_method :__organization_name__, :organization_name
-    def in_actual_organization?(request, domain = nil)
-      actual_organization_name(request, domain).present?
-    end
-
-    def actual_organization_name(request, domain)
-      name = __organization_name__(request, domain)
-      name unless %w(auth login logout).include? name
-    end
-
-    def organization_name(request, domain)
-      actual_organization_name(request, domain) || 'base'
-    end
-
-    patch :inorganic_path_for do |request, hyper|
-      if in_actual_organization?(request)
-        hyper.call(request)
-      else
-        path_for(request)
-      end
-    end
-  end
-end
-
 require_relative './laboratory/version'
 require_relative './laboratory/extensions'
 require_relative './laboratory/controllers'

spec/features/immersive_redirection_spec.rb

@@ -2,7 +2,7 @@
 
 feature 'Immersive redirection Flow', organization_workspace: :test, subdomain_redirection_without_port: true do
   def create_guide(name)
-    create(:guide, name: name)
+    create(:guide, name: name, exercises: create_list(:exercise, 3))
   end
 
   def create_immersive_organization(name, guides)
@@ -27,6 +27,9 @@ def create_immersive_organization(name, guides)
   let(:lesson_two) { create(:lesson, guide: guide_two) }
   let(:lesson_three) { create(:lesson, guide: guide_three) }
 
+  let(:discussion_exercise) { guide_one.exercises.first }
+  let(:discussion) { create(:discussion, item: discussion_exercise, organization: Organization.current) }
+
   before { book.update! chapters: [create(:chapter, lessons: [lesson_one, lesson_two, lesson_three])] }
   before { set_current_user! user }
 
@@ -79,6 +82,21 @@ def create_immersive_organization(name, guides)
     end
 
     context 'when navigating to a discussion' do
+      feature 'and forum enabled' do
+        before { immersive_orga.update(forum_enabled: true) }
+        before { visit exercise_discussion_path(discussion_exercise, discussion) }
+        it_behaves_like 'immersive redirection', 'immersive-orga'
+        it_behaves_like 'navigate to discussions main page'
+      end
+
+      feature 'and forum not enabled' do
+        before { visit exercise_discussion_path(discussion_exercise, discussion) }
+        it_behaves_like 'immersive redirection', 'immersive-orga'
+        it_behaves_like 'navigate to main page'
+      end
+    end
+
+    context 'when navigating to discussions page' do
       feature 'and forum enabled' do
         before { immersive_orga.update(forum_enabled: true) }
         before { visit discussions_path }