summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2017-04-05 02:51:02 +0300
committerFatih Acet <acetfatih@gmail.com>2017-04-06 20:29:26 +0300
commit708e3bfd560b8ee3ca6afb64b0ab4866df83239e (patch)
tree3fc9cf656d696de9d4a93ddfa0566f6d7807c6e6
parent82e05ea5cf850144974cf53051954243a9d557de (diff)
downloadgitlab-ce-708e3bfd560b8ee3ca6afb64b0ab4866df83239e.tar.gz
MRWidget: ESLint fixes.
-rw-r--r--app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.js13
-rw-r--r--spec/javascripts/vue_mr_widget/components/mr_widget_deployment_spec.js10
-rw-r--r--spec/javascripts/vue_mr_widget/components/states/mr_widget_failed_to_merge_spec.js4
-rw-r--r--spec/javascripts/vue_mr_widget/components/states/mr_widget_missing_branch_spec.js2
-rw-r--r--spec/javascripts/vue_mr_widget/components/states/mr_widget_wip_spec.js6
5 files changed, 17 insertions, 18 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.js b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.js
index ac9d07c842b..9fe4f91a157 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.js
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.js
@@ -26,21 +26,21 @@ export default {
},
shouldShowRevertForCurrentMR() {
- return (this.mr.canBeReverted && this.mr.userCanCollaborateWithProject);
+ return this.mr.canBeReverted && this.mr.userCanCollaborateWithProject;
},
- // TODO: @fatih, we need to handle this case without UJS post in the future
+ // TODO: Remove UJS
shouldShowRevertForForkMR() {
- return (this.mr.canBeReverted && this.mr.userCanForkProject);
+ return this.mr.canBeReverted && this.mr.userCanForkProject;
},
shouldShowCherryPickForCurrentMR() {
- return (this.mr.canBeCherryPicked && this.mr.userCanCollaborateWithProject);
+ return this.mr.canBeCherryPicked && this.mr.userCanCollaborateWithProject;
},
- // TODO: @fatih, we need to handle this case without UJS post in the future
+ // TODO: Remove UJS
shouldShowCherryPickForForkMR() {
- return (this.mr.canBeCherryPicked && this.mr.userCanForkProject);
+ return this.mr.canBeCherryPicked && this.mr.userCanForkProject;
},
},
methods: {
@@ -114,7 +114,6 @@ export default {
data-method='post'
:href="mr.cherryPickInForkPath"
data-original-title="Cherry-pick this merge request in a new merge request">Cherry-pick</a>
-
</div>
</div>
`,
diff --git a/spec/javascripts/vue_mr_widget/components/mr_widget_deployment_spec.js b/spec/javascripts/vue_mr_widget/components/mr_widget_deployment_spec.js
index b1628b8cab2..782cd13cc24 100644
--- a/spec/javascripts/vue_mr_widget/components/mr_widget_deployment_spec.js
+++ b/spec/javascripts/vue_mr_widget/components/mr_widget_deployment_spec.js
@@ -20,7 +20,7 @@ const createComponent = () => {
deployments: deploymentMockData,
};
const service = {
- stopEnvironment() {}
+ stopEnvironment() {},
};
return new Component({
@@ -52,7 +52,7 @@ describe('MRWidgetDeployment', () => {
});
describe('methods', () => {
- const vm = createComponent();
+ let vm = createComponent();
const deployment = deploymentMockData[0];
describe('formatDate', () => {
@@ -109,7 +109,7 @@ describe('MRWidgetDeployment', () => {
redirect_url: url,
};
},
- })
+ });
}));
vm.stopEnvironment(deploymentMockData);
@@ -117,7 +117,7 @@ describe('MRWidgetDeployment', () => {
};
it('should show a confirm dialog and call service.stopEnvironment when confirmed', (done) => {
- const vm = mockStopEnvironment(true);
+ vm = mockStopEnvironment(true);
spyOn(gl.utils, 'visitUrl').and.returnValue(true);
expect(window.confirm).toHaveBeenCalled();
@@ -129,7 +129,7 @@ describe('MRWidgetDeployment', () => {
});
it('should show a confirm dialog but should not work if the dialog is rejected', () => {
- const vm = mockStopEnvironment(false);
+ vm = mockStopEnvironment(false);
expect(window.confirm).toHaveBeenCalled();
expect(vm.service.stopEnvironment).not.toHaveBeenCalled();
diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_failed_to_merge_spec.js b/spec/javascripts/vue_mr_widget/components/states/mr_widget_failed_to_merge_spec.js
index 46284b41371..017ef32ee29 100644
--- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_failed_to_merge_spec.js
+++ b/spec/javascripts/vue_mr_widget/components/states/mr_widget_failed_to_merge_spec.js
@@ -5,7 +5,7 @@ import eventHub from '~/vue_merge_request_widget/event_hub';
const createComponent = () => {
const Component = Vue.extend(failedToMergeComponent);
return new Component({
- el: document.createElement('div')
+ el: document.createElement('div'),
});
};
@@ -52,7 +52,7 @@ describe('MRWidgetFailedToMerge', () => {
expect(vm.timer).toEqual(10);
- for (let i = 0; i < 10; i++) {
+ for (let i = 0; i < 10; i++) { // eslint-disable-line
expect(vm.timer).toEqual(10 - i);
vm.updateTimer();
}
diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_missing_branch_spec.js b/spec/javascripts/vue_mr_widget/components/states/mr_widget_missing_branch_spec.js
index cea1d898a9a..51e773c043d 100644
--- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_missing_branch_spec.js
+++ b/spec/javascripts/vue_mr_widget/components/states/mr_widget_missing_branch_spec.js
@@ -4,7 +4,7 @@ import missingBranchComponent from '~/vue_merge_request_widget/components/states
const createComponent = () => {
const Component = Vue.extend(missingBranchComponent);
const mr = {
- sourceBranchRemoved: true
+ sourceBranchRemoved: true,
};
return new Component({
diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_wip_spec.js b/spec/javascripts/vue_mr_widget/components/states/mr_widget_wip_spec.js
index 2275f0735ec..e14f9a26cd7 100644
--- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_wip_spec.js
+++ b/spec/javascripts/vue_mr_widget/components/states/mr_widget_wip_spec.js
@@ -9,7 +9,7 @@ const createComponent = () => {
canUpdateMergeRequest: true,
};
const service = {
- removeWIP() {}
+ removeWIP() {},
};
return new Component({
el: document.createElement('div'),
@@ -33,7 +33,7 @@ describe('MRWidgetWIP', () => {
describe('methods', () => {
const mrObj = {
is_new_mr_data: true,
- }
+ };
describe('removeWIP', () => {
it('should make a request to service and handle response', (done) => {
@@ -46,7 +46,7 @@ describe('MRWidgetWIP', () => {
json() {
return mrObj;
},
- })
+ });
}));
vm.removeWIP();