From 8cc6e3eecb3b31e558f4151d612ba585ecd2a6c7 Mon Sep 17 00:00:00 2001 From: Paula Camargo Date: Wed, 21 Feb 2024 17:17:11 -0800 Subject: [PATCH 1/4] Add autoStartBrowser --- src/extension/debugger/configuration/providers/djangoLaunch.ts | 1 + src/extension/debugger/configuration/providers/flaskLaunch.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/src/extension/debugger/configuration/providers/djangoLaunch.ts b/src/extension/debugger/configuration/providers/djangoLaunch.ts index 24657d5e..f3a5fedc 100644 --- a/src/extension/debugger/configuration/providers/djangoLaunch.ts +++ b/src/extension/debugger/configuration/providers/djangoLaunch.ts @@ -31,6 +31,7 @@ export async function buildDjangoLaunchDebugConfiguration( program: program || defaultProgram, args: ['runserver'], django: true, + autoStartBrowser: false }; if (!program) { const selectedProgram = await input.showInputBox({ diff --git a/src/extension/debugger/configuration/providers/flaskLaunch.ts b/src/extension/debugger/configuration/providers/flaskLaunch.ts index 5e1e3982..07dc2be9 100644 --- a/src/extension/debugger/configuration/providers/flaskLaunch.ts +++ b/src/extension/debugger/configuration/providers/flaskLaunch.ts @@ -32,6 +32,7 @@ export async function buildFlaskLaunchDebugConfiguration( }, args: ['run', '--no-debugger', '--no-reload'], jinja: true, + autoStartBrowser: false }; if (!application) { From a0e3e0445f291bcf0fddcd7432253664fe5269c2 Mon Sep 17 00:00:00 2001 From: Paula Camargo Date: Wed, 21 Feb 2024 17:17:19 -0800 Subject: [PATCH 2/4] fix tests --- .../unittest/configuration/providers/djangoLaunch.unit.test.ts | 3 +++ .../unittest/configuration/providers/flaskLaunch.unit.test.ts | 2 ++ 2 files changed, 5 insertions(+) diff --git a/src/test/unittest/configuration/providers/djangoLaunch.unit.test.ts b/src/test/unittest/configuration/providers/djangoLaunch.unit.test.ts index 350a7896..5344f111 100644 --- a/src/test/unittest/configuration/providers/djangoLaunch.unit.test.ts +++ b/src/test/unittest/configuration/providers/djangoLaunch.unit.test.ts @@ -109,6 +109,8 @@ suite('Debugging - Configuration Provider Django', () => { program: 'hello', args: ['runserver'], django: true, + autoStartBrowser: false + }; expect(state.config).to.be.deep.equal(config); @@ -129,6 +131,7 @@ suite('Debugging - Configuration Provider Django', () => { program: defaultProgram, args: ['runserver'], django: true, + autoStartBrowser: false }; expect(state.config).to.be.deep.equal(config); diff --git a/src/test/unittest/configuration/providers/flaskLaunch.unit.test.ts b/src/test/unittest/configuration/providers/flaskLaunch.unit.test.ts index 7886f502..0ae06c37 100644 --- a/src/test/unittest/configuration/providers/flaskLaunch.unit.test.ts +++ b/src/test/unittest/configuration/providers/flaskLaunch.unit.test.ts @@ -60,6 +60,7 @@ suite('Debugging - Configuration Provider Flask', () => { }, args: ['run', '--no-debugger', '--no-reload'], jinja: true, + autoStartBrowser: false }; expect(state.config).to.be.deep.equal(config); @@ -82,6 +83,7 @@ suite('Debugging - Configuration Provider Flask', () => { }, args: ['run', '--no-debugger', '--no-reload'], jinja: true, + autoStartBrowser: false }; expect(state.config).to.be.deep.equal(config); From 48c916a66ab0e793b671b720650cf40a06a1de88 Mon Sep 17 00:00:00 2001 From: Paula Camargo Date: Wed, 21 Feb 2024 17:53:32 -0800 Subject: [PATCH 3/4] fix lint --- .../configuration/providers/djangoLaunch.ts | 2 +- .../configuration/providers/flaskLaunch.ts | 2 +- .../providers/djangoLaunch.unit.test.ts | 5 ++-- .../providers/flaskLaunch.unit.test.ts | 26 +++++++++++++++++-- 4 files changed, 28 insertions(+), 7 deletions(-) diff --git a/src/extension/debugger/configuration/providers/djangoLaunch.ts b/src/extension/debugger/configuration/providers/djangoLaunch.ts index f3a5fedc..3aa75e33 100644 --- a/src/extension/debugger/configuration/providers/djangoLaunch.ts +++ b/src/extension/debugger/configuration/providers/djangoLaunch.ts @@ -31,7 +31,7 @@ export async function buildDjangoLaunchDebugConfiguration( program: program || defaultProgram, args: ['runserver'], django: true, - autoStartBrowser: false + autoStartBrowser: false, }; if (!program) { const selectedProgram = await input.showInputBox({ diff --git a/src/extension/debugger/configuration/providers/flaskLaunch.ts b/src/extension/debugger/configuration/providers/flaskLaunch.ts index 07dc2be9..bd64bdc0 100644 --- a/src/extension/debugger/configuration/providers/flaskLaunch.ts +++ b/src/extension/debugger/configuration/providers/flaskLaunch.ts @@ -32,7 +32,7 @@ export async function buildFlaskLaunchDebugConfiguration( }, args: ['run', '--no-debugger', '--no-reload'], jinja: true, - autoStartBrowser: false + autoStartBrowser: false, }; if (!application) { diff --git a/src/test/unittest/configuration/providers/djangoLaunch.unit.test.ts b/src/test/unittest/configuration/providers/djangoLaunch.unit.test.ts index 5344f111..60873509 100644 --- a/src/test/unittest/configuration/providers/djangoLaunch.unit.test.ts +++ b/src/test/unittest/configuration/providers/djangoLaunch.unit.test.ts @@ -109,8 +109,7 @@ suite('Debugging - Configuration Provider Django', () => { program: 'hello', args: ['runserver'], django: true, - autoStartBrowser: false - + autoStartBrowser: false, }; expect(state.config).to.be.deep.equal(config); @@ -131,7 +130,7 @@ suite('Debugging - Configuration Provider Django', () => { program: defaultProgram, args: ['runserver'], django: true, - autoStartBrowser: false + autoStartBrowser: false, }; expect(state.config).to.be.deep.equal(config); diff --git a/src/test/unittest/configuration/providers/flaskLaunch.unit.test.ts b/src/test/unittest/configuration/providers/flaskLaunch.unit.test.ts index 0ae06c37..a3baa651 100644 --- a/src/test/unittest/configuration/providers/flaskLaunch.unit.test.ts +++ b/src/test/unittest/configuration/providers/flaskLaunch.unit.test.ts @@ -41,6 +41,28 @@ suite('Debugging - Configuration Provider Flask', () => { expect(file).to.be.equal('app.py'); }); + test('Launch JSON with valid python path', async () => { + const folder = { uri: Uri.parse(path.join('one', 'two')), name: '1', index: 0 }; + const state = { config: {}, folder }; + + await flaskLaunch.buildFlaskLaunchDebugConfiguration(instance(input), state); + + const config = { + name: DebugConfigStrings.flask.snippet.name, + type: DebuggerTypeName, + request: 'launch', + module: 'flask', + env: { + FLASK_APP: 'app.py', + FLASK_DEBUG: '1', + }, + args: ['run', '--no-debugger', '--no-reload'], + jinja: true, + autoStartBrowser: false, + }; + + expect(state.config).to.be.deep.equal(config); + }); test('Launch JSON with selected app path', async () => { const folder = { uri: Uri.parse(path.join('one', 'two')), name: '1', index: 0 }; const state = { config: {}, folder }; @@ -60,7 +82,7 @@ suite('Debugging - Configuration Provider Flask', () => { }, args: ['run', '--no-debugger', '--no-reload'], jinja: true, - autoStartBrowser: false + autoStartBrowser: false, }; expect(state.config).to.be.deep.equal(config); @@ -83,7 +105,7 @@ suite('Debugging - Configuration Provider Flask', () => { }, args: ['run', '--no-debugger', '--no-reload'], jinja: true, - autoStartBrowser: false + autoStartBrowser: false, }; expect(state.config).to.be.deep.equal(config); From bc649720d34f8286c43c0425c0c3a4c7c51a3c65 Mon Sep 17 00:00:00 2001 From: Paula Camargo Date: Thu, 22 Feb 2024 15:35:28 -0800 Subject: [PATCH 4/4] fix tests --- .../providers/flaskLaunch.unit.test.ts | 22 ------------------- 1 file changed, 22 deletions(-) diff --git a/src/test/unittest/configuration/providers/flaskLaunch.unit.test.ts b/src/test/unittest/configuration/providers/flaskLaunch.unit.test.ts index a3baa651..7fd6f1ea 100644 --- a/src/test/unittest/configuration/providers/flaskLaunch.unit.test.ts +++ b/src/test/unittest/configuration/providers/flaskLaunch.unit.test.ts @@ -41,28 +41,6 @@ suite('Debugging - Configuration Provider Flask', () => { expect(file).to.be.equal('app.py'); }); - test('Launch JSON with valid python path', async () => { - const folder = { uri: Uri.parse(path.join('one', 'two')), name: '1', index: 0 }; - const state = { config: {}, folder }; - - await flaskLaunch.buildFlaskLaunchDebugConfiguration(instance(input), state); - - const config = { - name: DebugConfigStrings.flask.snippet.name, - type: DebuggerTypeName, - request: 'launch', - module: 'flask', - env: { - FLASK_APP: 'app.py', - FLASK_DEBUG: '1', - }, - args: ['run', '--no-debugger', '--no-reload'], - jinja: true, - autoStartBrowser: false, - }; - - expect(state.config).to.be.deep.equal(config); - }); test('Launch JSON with selected app path', async () => { const folder = { uri: Uri.parse(path.join('one', 'two')), name: '1', index: 0 }; const state = { config: {}, folder };