diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-04-17 09:24:32 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-04-20 10:29:11 +0100 |
| commit | 5995b8921ef965aeb1b92b718a07617292607fb1 (patch) | |
| tree | 9e353f7bf4bae9d9914c40e2973b8b9172165801 | |
| parent | 1d0e736c97cbb08a6c1cdb3a8ed92eb353cb7687 (diff) | |
| download | gitlab-ce-5995b8921ef965aeb1b92b718a07617292607fb1.tar.gz | |
Merge branch 'ide-subgroup-fix' into 'master'
Fixed web IDE not working for sub-groups
Closes #45412
See merge request gitlab-org/gitlab-ce!18404
| -rw-r--r-- | app/assets/javascripts/ide/ide_router.js | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/ide-subgroup-fix.yml | 5 | ||||
| -rw-r--r-- | spec/features/ide_spec.rb | 25 |
3 files changed, 32 insertions, 2 deletions
diff --git a/app/assets/javascripts/ide/ide_router.js b/app/assets/javascripts/ide/ide_router.js index 20983666b4a..4a0a303d5a6 100644 --- a/app/assets/javascripts/ide/ide_router.js +++ b/app/assets/javascripts/ide/ide_router.js @@ -36,11 +36,11 @@ const router = new VueRouter({ base: `${gon.relative_url_root}/-/ide/`, routes: [ { - path: '/project/:namespace/:project', + path: '/project/:namespace/:project+', component: EmptyRouterComponent, children: [ { - path: ':targetmode/:branch/*', + path: ':targetmode(edit|tree|blob)/:branch/*', component: EmptyRouterComponent, }, { 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 |