bugcrowd
diff --git a/‎lib/active_admin/namespace.rb
Lines changed: 11 additions & 4 deletions b/‎lib/active_admin/namespace.rb
Lines changed: 11 additions & 4 deletions
diff --git a/‎lib/active_admin/resource/routes.rb
Lines changed: 1 addition & 1 deletion b/‎lib/active_admin/resource/routes.rb
Lines changed: 1 addition & 1 deletion
diff --git a/‎spec/requests/default_namespace_spec.rb
Lines changed: 38 additions & 6 deletions b/‎spec/requests/default_namespace_spec.rb
Lines changed: 38 additions & 6 deletions
@@ -27,16 +27,20 @@ module ActiveAdmin
   class Namespace
     RegisterEvent = 'active_admin.namespace.register'.freeze
 
-    attr_reader :application, :resources, :name, :menus
+    attr_reader :application, :resources, :menus
 
     def initialize(application, name)
       @application = application
-      @name = name.to_s.underscore.to_sym
+      @name = name.to_s.underscore
       @resources = ResourceCollection.new
       register_module unless root?
       build_menu_collection
     end
 
+    def name
+      @name.to_sym
+    end
+
     # Register a resource into this namespace. The preffered method to access this is to
     # use the global registration ActiveAdmin.register which delegates to the proper
     # namespace instance.
@@ -78,8 +82,11 @@ def root?
     #   Namespace.new(:root).module_name # => nil
     #
     def module_name
-      return nil if root?
-      @module_name ||= name.to_s.camelize
+      root? ? nil : @name.camelize
+    end
+
+    def route_prefix
+      root? ? nil : @name
     end
 
     # Unload all the registered resources for this namespace
 
@@ -25,7 +25,7 @@ def route_edit_instance_path(resource, additional_params = {})
 
       # Returns the routes prefix for this config
       def route_prefix
-        namespace.module_name.try(:underscore)
+        namespace.route_prefix
       end
 
       def route_builder
 
@@ -4,15 +4,18 @@
 
   include Rails.application.routes.url_helpers
 
+  let(:resource) { ActiveAdmin.register Category }
+
   [false, nil].each do |value|
 
     describe "with a #{value} default namespace" do
 
       around do |example|
-        application = ActiveAdmin::Application.new
-        application.default_namespace = value
+        with_custom_default_namespace(value) { example.call }
+      end
 
-        with_temp_application(application) { example.call }
+      it "should generate resource paths" do
+        expect(resource.route_collection_path).to eq "/categories"
       end
 
       it "should generate a log out path" do
@@ -30,10 +33,11 @@
   describe "with a test default namespace" do
 
     around do |example|
-      application = ActiveAdmin::Application.new
-      application.default_namespace = :test
+      with_custom_default_namespace(:test) { example.call }
+    end
 
-      with_temp_application(application) { example.call }
+    it "should generate resource paths" do
+      expect(resource.route_collection_path).to eq "/test/categories"
     end
 
     it "should generate a log out path" do
@@ -46,4 +50,32 @@
 
   end
 
+  describe "with a namespace with underscores in the name" do
+
+    around do |example|
+      with_custom_default_namespace(:abc_123) { example.call }
+    end
+
+    it "should generate resource paths" do
+      expect(resource.route_collection_path).to eq "/abc_123/categories"
+    end
+
+    it "should generate a log out path" do
+      expect(destroy_admin_user_session_path).to eq "/abc_123/logout"
+    end
+
+    it "should generate a log in path" do
+      expect(new_admin_user_session_path).to eq "/abc_123/login"
+    end
+
+  end
+
+  private
+
+  def with_custom_default_namespace(namespace)
+    application = ActiveAdmin::Application.new
+    application.default_namespace = namespace
+
+    with_temp_application(application) { yield }
+  end
 end