summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-04-16 17:02:12 +0100
committerPhil Hughes <me@iamphill.com>2018-04-16 17:02:12 +0100
commit82b6f82f718b73d12d6d9ee7ff547bb4757ce0cd (patch)
tree45f1ee00b9d51c7f38403d1b33bde4a2af56b46e
parentddd7a81d4f20ca656731d4c01512893d2559a012 (diff)
downloadgitlab-ce-82b6f82f718b73d12d6d9ee7ff547bb4757ce0cd.tar.gz
Fixed web IDE not working for sub-groups
Closes #45412
-rw-r--r--app/assets/javascripts/ide/ide_router.js2
-rw-r--r--changelogs/unreleased/ide-subgroup-fix.yml5
-rw-r--r--spec/features/ide_spec.rb25
3 files changed, 31 insertions, 1 deletions
diff --git a/app/assets/javascripts/ide/ide_router.js b/app/assets/javascripts/ide/ide_router.js
index 20983666b4a..15f9d2ecf4c 100644
--- a/app/assets/javascripts/ide/ide_router.js
+++ b/app/assets/javascripts/ide/ide_router.js
@@ -36,7 +36,7 @@ const router = new VueRouter({
base: `${gon.relative_url_root}/-/ide/`,
routes: [
{
- path: '/project/:namespace/:project',
+ path: '/project/:namespace/:project*',
component: EmptyRouterComponent,
children: [
{
diff --git a/changelogs/unreleased/ide-subgroup-fix.yml b/changelogs/unreleased/ide-subgroup-fix.yml
new file mode 100644
index 00000000000..2234c42b4bd
--- /dev/null
+++ b/changelogs/unreleased/ide-subgroup-fix.yml
@@ -0,0 +1,5 @@
+---
+title: Fixed IDE not loading for sub groups
+merge_request:
+author:
+type: fixed
diff --git a/spec/features/ide_spec.rb b/spec/features/ide_spec.rb
new file mode 100644
index 00000000000..b3f24c2966d
--- /dev/null
+++ b/spec/features/ide_spec.rb
@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe 'IDE', :js do
+ describe 'sub-groups' do
+ let(:user) { create(:user) }
+ let(:group) { create(:group) }
+ let(:subgroup) { create(:group, parent: group) }
+ let(:subgroup_project) { create(:project, :repository, namespace: subgroup) }
+
+ before do
+ subgroup_project.add_master(user)
+ sign_in(user)
+
+ visit project_path(subgroup_project)
+
+ click_link('Web IDE')
+
+ wait_for_requests
+ end
+
+ it 'loads project in web IDE' do
+ expect(page).to have_selector('.context-header', text: subgroup_project.name)
+ end
+ end
+end