Merge branch 'acet-fix-mr-widget-state' into 'master'
Change order of if blocks to determine widget state properly. Closes #32550 See merge request !11668
This commit is contained in:
commit
34a6d80e11
|
@ -11,10 +11,6 @@ export default function deviseState(data) {
|
|||
return 'conflicts';
|
||||
} else if (data.work_in_progress) {
|
||||
return 'workInProgress';
|
||||
} else if (this.mergeWhenPipelineSucceeds) {
|
||||
return this.mergeError ? 'autoMergeFailed' : 'mergeWhenPipelineSucceeds';
|
||||
} else if (!this.canMerge) {
|
||||
return 'notAllowedToMerge';
|
||||
} else if (this.onlyAllowMergeIfPipelineSucceeds && this.isPipelineFailed) {
|
||||
return 'pipelineFailed';
|
||||
} else if (this.hasMergeableDiscussionsState) {
|
||||
|
@ -23,6 +19,10 @@ export default function deviseState(data) {
|
|||
return 'pipelineBlocked';
|
||||
} else if (this.hasSHAChanged) {
|
||||
return 'shaMismatch';
|
||||
} else if (this.mergeWhenPipelineSucceeds) {
|
||||
return this.mergeError ? 'autoMergeFailed' : 'mergeWhenPipelineSucceeds';
|
||||
} else if (!this.canMerge) {
|
||||
return 'notAllowedToMerge';
|
||||
} else if (this.canBeMerged) {
|
||||
return 'readyToMerge';
|
||||
}
|
||||
|
|
|
@ -25,6 +25,12 @@ describe('getStateKey', () => {
|
|||
context.canBeMerged = true;
|
||||
expect(bound()).toEqual('readyToMerge');
|
||||
|
||||
context.canMerge = false;
|
||||
expect(bound()).toEqual('notAllowedToMerge');
|
||||
|
||||
context.mergeWhenPipelineSucceeds = true;
|
||||
expect(bound()).toEqual('mergeWhenPipelineSucceeds');
|
||||
|
||||
context.hasSHAChanged = true;
|
||||
expect(bound()).toEqual('shaMismatch');
|
||||
|
||||
|
@ -38,12 +44,6 @@ describe('getStateKey', () => {
|
|||
context.isPipelineFailed = true;
|
||||
expect(bound()).toEqual('pipelineFailed');
|
||||
|
||||
context.canMerge = false;
|
||||
expect(bound()).toEqual('notAllowedToMerge');
|
||||
|
||||
context.mergeWhenPipelineSucceeds = true;
|
||||
expect(bound()).toEqual('mergeWhenPipelineSucceeds');
|
||||
|
||||
data.work_in_progress = true;
|
||||
expect(bound()).toEqual('workInProgress');
|
||||
|
||||
|
|
Loading…
Reference in New Issue