kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Updates tests and i18n

This commit is contained in:
Filipa Lacerda 2017-09-07 14:40:42 +01:00
parent e5e0acfc4d
commit 2c4d57ffdf
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/shared/_auto_devops_callout.html.haml
View File

@ -9,7 +9,7 @@
%h4= _('Auto DevOps (Beta)')
%p= _('Auto DevOps can be activated for this project. It will automatically build, test, and deploy your application based on a predefined CI/CD configuration.')
%p
#{s_('LearnMoreInThe|Learn more in the')}
#{s_('AutoDevOps|Learn more in the')}
= link_to _('Auto DevOps documentation'), help_page_path('topics/autodevops/index.md'), target: '_blank', rel: 'noopener noreferrer'
= link_to _('Enable in settings'), project_settings_ci_cd_path(@project, anchor: 'js-general-pipeline-settings'), class: 'btn btn-primary js-close-callout'

15
spec/javascripts/user_callout_spec.js
View File

@ -35,24 +35,15 @@ describe('UserCallout', function () {
});
describe('Sets cookie with setCalloutPerProject', () => {
let originalGon;
beforeEach(() => {
originalGon = window.gon;
window.gon = Object.assign({}, {
project_url: 'http://localhost:3000/gitlab-org/gitlab-ce',
});
spyOn(Cookies, 'set').and.callFake(() => {});
document.querySelector('.user-callout').setAttribute('data-project-path', 'foo/bar');
this.userCallout = new UserCallout({ setCalloutPerProject: true });
});
afterEach(() => {
window.gon = originalGon;
});
it('sets a cookie when the user clicks the close button', () => {
this.userCalloutBtn.click();
// Note the path of a cookie is not accessible via JS, we can not test for that
// We can test if a cookie is set when an option is provided
expect(Cookies.get(USER_CALLOUT_COOKIE)).toBe('true');
expect(Cookies.set).toHaveBeenCalledWith('user_callout_dismissed', 'true', Object({ expires: 365, path: 'foo/bar' }));
});
});
});