1 files changed, 58 insertions, 18 deletions
diff --git a/spec/helpers/tab_helper_spec.rb b/spec/helpers/tab_helper_spec.rb
index b473c0a7416..9abf63d4bd4 100644
--- a/spec/helpers/tab_helper_spec.rb
+++ b/spec/helpers/tab_helper_spec.rb
@@ -9,31 +9,71 @@ describe TabHelper do
       allow(self).to receive(:action_name).and_return('foo')
     end
 
-    it "captures block output" do
-      expect(nav_link { "Testing Blocks" }).to match(/Testing Blocks/)
+    context 'with the content of the li' do
+      it "captures block output" do
+        expect(nav_link { "Testing Blocks" }).to match(/Testing Blocks/)
+      end
     end
 
-    it "performs checks on the current controller" do
-      expect(nav_link(controller: :foo)).to match(/<li class="active">/)
-      expect(nav_link(controller: :bar)).not_to match(/active/)
-      expect(nav_link(controller: [:foo, :bar])).to match(/active/)
-    end
+    context 'with controller param' do
+      it "performs checks on the current controller" do
+        expect(nav_link(controller: :foo)).to match(/<li class="active">/)
+        expect(nav_link(controller: :bar)).not_to match(/active/)
+        expect(nav_link(controller: [:foo, :bar])).to match(/active/)
+      end
+
+      context 'with action param' do
+        it "performs checks on both controller and action when both are present" do
+          expect(nav_link(controller: :bar, action: :foo)).not_to match(/active/)
+          expect(nav_link(controller: :foo, action: :bar)).not_to match(/active/)
+          expect(nav_link(controller: :foo, action: :foo)).to match(/active/)
+        end
+      end
+
+      context 'with namespace in path notation' do
+        before do
+          allow(controller).to receive(:controller_path).and_return('bar/foo')
+        end
 
-    it "performs checks on the current action" do
-      expect(nav_link(action: :foo)).to match(/<li class="active">/)
-      expect(nav_link(action: :bar)).not_to match(/active/)
-      expect(nav_link(action: [:foo, :bar])).to match(/active/)
+        it 'performs checks on both controller and namespace' do
+          expect(nav_link(controller: 'foo/foo')).not_to match(/active/)
+          expect(nav_link(controller: 'bar/foo')).to match(/active/)
+        end
+
+        context 'with action param' do
+          it "performs checks on both namespace, controller and action when they are all present" do
+            expect(nav_link(controller: 'foo/foo', action: :foo)).not_to match(/active/)
+            expect(nav_link(controller: 'bar/foo', action: :bar)).not_to match(/active/)
+            expect(nav_link(controller: 'bar/foo', action: :foo)).to match(/active/)
+          end
+        end
+      end
     end
 
-    it "performs checks on both controller and action when both are present" do
-      expect(nav_link(controller: :bar, action: :foo)).not_to match(/active/)
-      expect(nav_link(controller: :foo, action: :bar)).not_to match(/active/)
-      expect(nav_link(controller: :foo, action: :foo)).to match(/active/)
+    context 'with action param' do
+      it "performs checks on the current action" do
+        expect(nav_link(action: :foo)).to match(/<li class="active">/)
+        expect(nav_link(action: :bar)).not_to match(/active/)
+        expect(nav_link(action: [:foo, :bar])).to match(/active/)
+      end
     end
 
-    it "accepts a path shorthand" do
-      expect(nav_link(path: 'foo#bar')).not_to match(/active/)
-      expect(nav_link(path: 'foo#foo')).to match(/active/)
+    context 'with path param' do
+      it "accepts a path shorthand" do
+        expect(nav_link(path: 'foo#bar')).not_to match(/active/)
+        expect(nav_link(path: 'foo#foo')).to match(/active/)
+      end
+
+      context 'with namespace' do
+        before do
+          allow(controller).to receive(:controller_path).and_return('bar/foo')
+        end
+
+        it 'accepts a path shorthand with namespace' do
+          expect(nav_link(path: 'bar/foo#foo')).to match(/active/)
+          expect(nav_link(path: 'foo/foo#foo')).not_to match(/active/)
+        end
+      end
     end
 
     it "passes extra html options to the list element" do