Commit a7bd0d9c authored by Eric Eastwood's avatar Eric Eastwood

Add help page link and standardize "Service Desk"

parent 088e2765
...@@ -37,7 +37,7 @@ export default { ...@@ -37,7 +37,7 @@ export default {
:checked="isEnabled" :checked="isEnabled"
@change="onCheckboxToggle($event)"> @change="onCheckboxToggle($event)">
<span class="descr"> <span class="descr">
Activate service desk Activate Service Desk
</span> </span>
</label> </label>
</div> </div>
......
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
%fieldset.js-service-desk-setting-wrapper.features.append-bottom-default %fieldset.js-service-desk-setting-wrapper.features.append-bottom-default
%h5.prepend-top-0 %h5.prepend-top-0
Service Desk Service Desk
= link_to icon('question-circle'), help_page_path("TODO") = link_to icon('question-circle'), help_page_path('user/project/service_desk')
.js-service-desk-setting-root{ data: { endpoint: namespace_project_service_desk_path(@project.namespace, @project), .js-service-desk-setting-root{ data: { endpoint: namespace_project_service_desk_path(@project.namespace, @project),
enabled: @project.service_desk_enabled, enabled: @project.service_desk_enabled,
incoming_email: (@project.service_desk_address if @project.service_desk_enabled) } } incoming_email: (@project.service_desk_address if @project.service_desk_enabled) } }
......
...@@ -15,7 +15,7 @@ describe 'Service Desk Setting', js: true, feature: true do ...@@ -15,7 +15,7 @@ describe 'Service Desk Setting', js: true, feature: true do
visit edit_namespace_project_path(project.namespace, project) visit edit_namespace_project_path(project.namespace, project)
end end
it 'shows service desk activation checkbox' do it 'shows Service Desk activation checkbox' do
expect(page).to have_selector("#service-desk-enabled-checkbox") expect(page).to have_selector("#service-desk-enabled-checkbox")
end end
......
...@@ -26,7 +26,7 @@ describe('ServiceDeskService', () => { ...@@ -26,7 +26,7 @@ describe('ServiceDeskService', () => {
}); });
describe('toggleServiceDesk', () => { describe('toggleServiceDesk', () => {
it('enable service desk', (done) => { it('enable Service Desk', (done) => {
spyOn(service.serviceDeskResource, 'update').and.returnValue(Promise.resolve({ spyOn(service.serviceDeskResource, 'update').and.returnValue(Promise.resolve({
data: { data: {
service_desk_enabled: true, service_desk_enabled: true,
...@@ -40,11 +40,11 @@ describe('ServiceDeskService', () => { ...@@ -40,11 +40,11 @@ describe('ServiceDeskService', () => {
done(); done();
}) })
.catch((err) => { .catch((err) => {
done.fail(`Failed to enable service desk and fetch incoming email:\n${err}`); done.fail(`Failed to enable Service Desk and fetch incoming email:\n${err}`);
}); });
}); });
it('disable service desk', (done) => { it('disable Service Desk', (done) => {
spyOn(service.serviceDeskResource, 'update').and.returnValue(Promise.resolve({ spyOn(service.serviceDeskResource, 'update').and.returnValue(Promise.resolve({
data: { data: {
service_desk_enabled: false, service_desk_enabled: false,
...@@ -58,7 +58,7 @@ describe('ServiceDeskService', () => { ...@@ -58,7 +58,7 @@ describe('ServiceDeskService', () => {
done(); done();
}) })
.catch((err) => { .catch((err) => {
done.fail(`Failed to disable service desk and reset incoming email:\n${err}`); done.fail(`Failed to disable Service Desk and reset incoming email:\n${err}`);
}); });
}); });
}); });
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment