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
This commit is contained in:
commit
a18363e48e
|
@ -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,
|
||||
},
|
||||
{
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Fixed IDE not loading for sub groups
|
||||
merge_request:
|
||||
author:
|
||||
type: fixed
|
|
@ -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
|
Loading…
Reference in New Issue