Skip to content
Snippets Groups Projects
Unverified Commit 160157a9 authored by Mike Greiling's avatar Mike Greiling
Browse files

Prettify remaining files with differences in CE and EE

parent ed816c3d
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -218,6 +218,7 @@ export default {
diverged_commits_count: 0,
only_allow_merge_if_pipeline_succeeds: false,
commit_change_content_path: '/root/acets-app/merge_requests/22/commit_change_content',
merge_commit_path: 'http://localhost:3000/root/acets-app/commit/53027d060246c8f47e4a9310fb332aa52f221775',
troubleshooting_docs_path: 'help'
merge_commit_path:
'http://localhost:3000/root/acets-app/commit/53027d060246c8f47e4a9310fb332aa52f221775',
troubleshooting_docs_path: 'help',
};
Loading
Loading
@@ -454,7 +454,7 @@ describe('mrWidgetOptions', () => {
deployed_at: '2017-03-22T22:44:42.258Z',
deployed_at_formatted: 'Mar 22, 2017 10:44pm',
changes,
status: 'success'
status: 'success',
};
 
beforeEach(done => {
Loading
Loading
@@ -607,33 +607,36 @@ describe('mrWidgetOptions', () => {
 
describe('with post merge deployments', () => {
beforeEach(done => {
vm.mr.postMergeDeployments = [{
id: 15,
name: 'review/diplo',
url: '/root/acets-review-apps/environments/15',
stop_url: '/root/acets-review-apps/environments/15/stop',
metrics_url: '/root/acets-review-apps/environments/15/deployments/1/metrics',
metrics_monitoring_url: '/root/acets-review-apps/environments/15/metrics',
external_url: 'http://diplo.',
external_url_formatted: 'diplo.',
deployed_at: '2017-03-22T22:44:42.258Z',
deployed_at_formatted: 'Mar 22, 2017 10:44pm',
changes: [
{
path: 'index.html',
external_url: 'http://root-master-patch-91341.volatile-watch.surge.sh/index.html',
},
{
path: 'imgs/gallery.html',
external_url: 'http://root-master-patch-91341.volatile-watch.surge.sh/imgs/gallery.html',
},
{
path: 'about/',
external_url: 'http://root-master-patch-91341.volatile-watch.surge.sh/about/',
},
],
status: 'success'
}];
vm.mr.postMergeDeployments = [
{
id: 15,
name: 'review/diplo',
url: '/root/acets-review-apps/environments/15',
stop_url: '/root/acets-review-apps/environments/15/stop',
metrics_url: '/root/acets-review-apps/environments/15/deployments/1/metrics',
metrics_monitoring_url: '/root/acets-review-apps/environments/15/metrics',
external_url: 'http://diplo.',
external_url_formatted: 'diplo.',
deployed_at: '2017-03-22T22:44:42.258Z',
deployed_at_formatted: 'Mar 22, 2017 10:44pm',
changes: [
{
path: 'index.html',
external_url: 'http://root-master-patch-91341.volatile-watch.surge.sh/index.html',
},
{
path: 'imgs/gallery.html',
external_url:
'http://root-master-patch-91341.volatile-watch.surge.sh/imgs/gallery.html',
},
{
path: 'about/',
external_url: 'http://root-master-patch-91341.volatile-watch.surge.sh/about/',
},
],
status: 'success',
},
];
 
vm.$nextTick(done);
});
Loading
Loading
Loading
Loading
@@ -12,7 +12,7 @@ describe('collapsedGroupedDatePicker', () => {
});
 
describe('toggleCollapse events', () => {
beforeEach((done) => {
beforeEach(done => {
spyOn(vm, 'toggleSidebar');
vm.minDate = new Date('07/17/2016');
Vue.nextTick(done);
Loading
Loading
@@ -26,7 +26,7 @@ describe('collapsedGroupedDatePicker', () => {
});
 
describe('minDate and maxDate', () => {
beforeEach((done) => {
beforeEach(done => {
vm.minDate = new Date('07/17/2016');
vm.maxDate = new Date('07/17/2017');
Vue.nextTick(done);
Loading
Loading
@@ -42,7 +42,7 @@ describe('collapsedGroupedDatePicker', () => {
});
 
describe('minDate', () => {
beforeEach((done) => {
beforeEach(done => {
vm.minDate = new Date('07/17/2016');
Vue.nextTick(done);
});
Loading
Loading
@@ -56,7 +56,7 @@ describe('collapsedGroupedDatePicker', () => {
});
 
describe('maxDate', () => {
beforeEach((done) => {
beforeEach(done => {
vm.maxDate = new Date('07/17/2017');
Vue.nextTick(done);
});
Loading
Loading
Loading
Loading
@@ -41,7 +41,7 @@ describe('sidebarDatePicker', () => {
expect(vm.$el.querySelector('.value-content span').innerText.trim()).toEqual('None');
});
 
it('should render date-picker when editing', (done) => {
it('should render date-picker when editing', done => {
vm.editing = true;
Vue.nextTick(() => {
expect(vm.$el.querySelector('.pika-label')).toBeDefined();
Loading
Loading
@@ -50,7 +50,7 @@ describe('sidebarDatePicker', () => {
});
 
describe('editable', () => {
beforeEach((done) => {
beforeEach(done => {
vm.editable = true;
Vue.nextTick(done);
});
Loading
Loading
@@ -59,7 +59,7 @@ describe('sidebarDatePicker', () => {
expect(vm.$el.querySelector('.title .btn-blank').innerText.trim()).toEqual('Edit');
});
 
it('should enable editing when edit button is clicked', (done) => {
it('should enable editing when edit button is clicked', done => {
vm.isLoading = false;
Vue.nextTick(() => {
vm.$el.querySelector('.title .btn-blank').click();
Loading
Loading
@@ -70,7 +70,7 @@ describe('sidebarDatePicker', () => {
});
});
 
it('should render date if selectedDate', (done) => {
it('should render date if selectedDate', done => {
vm.selectedDate = new Date('07/07/2017');
Vue.nextTick(() => {
expect(vm.$el.querySelector('.value-content strong').innerText.trim()).toEqual('Jul 7, 2017');
Loading
Loading
@@ -79,7 +79,7 @@ describe('sidebarDatePicker', () => {
});
 
describe('selectedDate and editable', () => {
beforeEach((done) => {
beforeEach(done => {
vm.selectedDate = new Date('07/07/2017');
vm.editable = true;
Vue.nextTick(done);
Loading
Loading
@@ -100,7 +100,7 @@ describe('sidebarDatePicker', () => {
});
 
describe('showToggleSidebar', () => {
beforeEach((done) => {
beforeEach(done => {
vm.showToggleSidebar = true;
Vue.nextTick(done);
});
Loading
Loading
Loading
Loading
@@ -49,7 +49,9 @@ describe('DropdownValueCollapsedComponent', () => {
 
const vmMoreLabels = createComponent(mockMoreLabels);
 
expect(vmMoreLabels.labelsList).toBe('Foo Label, Foo Label, Foo Label, Foo Label, Foo Label, and 2 more');
expect(vmMoreLabels.labelsList).toBe(
'Foo Label, Foo Label, Foo Label, Foo Label, Foo Label, and 2 more',
);
vmMoreLabels.$destroy();
});
 
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment