mirror of
https://github.com/pgadmin-org/pgadmin4.git
synced 2025-02-25 18:55:31 -06:00
Fixed the SoanrQube code smell 'Variables should not be shadowed'.
This commit is contained in:
committed by
Akshay Joshi
parent
b5f0190799
commit
80ab596992
@@ -378,10 +378,10 @@ describe('ColumnSelector', function () {
|
||||
});
|
||||
});
|
||||
|
||||
function setupGrid(columns) {
|
||||
function setupGrid(gridColumns) {
|
||||
var columnSelector = new ColumnSelector();
|
||||
columns = columnSelector.getColumnDefinitions(columns);
|
||||
var grid = new SlickGrid(container, data, columns, options);
|
||||
gridColumns = columnSelector.getColumnDefinitions(gridColumns);
|
||||
var grid = new SlickGrid(container, data, gridColumns, options);
|
||||
|
||||
var cellSelectionModel = new XCellSelectionModel();
|
||||
grid.setSelectionModel(cellSelectionModel);
|
||||
|
||||
@@ -839,13 +839,13 @@ describe('ExecuteQuery', () => {
|
||||
errormsg: 'Some error in JSON',
|
||||
};
|
||||
let errorMessageText = 'Some plain text error';
|
||||
let response;
|
||||
let res;
|
||||
|
||||
describe('when the connection to the server was lost', () => {
|
||||
describe('when JSON response is available', () => {
|
||||
beforeEach(() => {
|
||||
response = {responseJSON: errorMessageJson};
|
||||
networkMock.onGet('/sqleditor/query_tool/poll/123').reply(401, response);
|
||||
res = {responseJSON: errorMessageJson};
|
||||
networkMock.onGet('/sqleditor/query_tool/poll/123').reply(401, res);
|
||||
|
||||
executeQuery.poll();
|
||||
});
|
||||
@@ -906,8 +906,8 @@ describe('ExecuteQuery', () => {
|
||||
});
|
||||
describe('when no JSON response is available', () => {
|
||||
beforeEach(() => {
|
||||
response = {errormsg: errorMessageText};
|
||||
networkMock.onGet('/sqleditor/query_tool/poll/123').reply(401, response);
|
||||
res = {errormsg: errorMessageText};
|
||||
networkMock.onGet('/sqleditor/query_tool/poll/123').reply(401, res);
|
||||
|
||||
executeQuery.poll();
|
||||
});
|
||||
|
||||
@@ -607,9 +607,9 @@ describe('queryToolActions', () => {
|
||||
});
|
||||
});
|
||||
|
||||
function setUpSpies(selectedQueryString, entireQueryString) {
|
||||
getValueSpy = jasmine.createSpy('getValueSpy').and.returnValue(entireQueryString);
|
||||
getSelectionSpy = jasmine.createSpy('getSelectionSpy').and.returnValue(selectedQueryString);
|
||||
function setUpSpies(selectedQueryStringArg, entireQueryStringArg) {
|
||||
getValueSpy = jasmine.createSpy('getValueSpy').and.returnValue(entireQueryStringArg);
|
||||
getSelectionSpy = jasmine.createSpy('getSelectionSpy').and.returnValue(selectedQueryStringArg);
|
||||
replaceSelectionSpy = jasmine.createSpy('replaceSelectionSpy');
|
||||
|
||||
sqlEditorController = {
|
||||
@@ -622,7 +622,7 @@ describe('queryToolActions', () => {
|
||||
uncomment: jasmine.createSpy('uncommentSpy'),
|
||||
replaceSelection: replaceSelectionSpy,
|
||||
getCursor: (isFrom) => {
|
||||
return entireQueryString.indexOf(selectedQueryString) + (isFrom ? 0 : selectedQueryString.length);
|
||||
return entireQueryStringArg.indexOf(selectedQueryStringArg) + (isFrom ? 0 : selectedQueryStringArg.length);
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user