From 72bd5854c8fbd80c6b8ba4d73b473eb552b9fed9 Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Wed, 11 Apr 2018 12:18:42 +0200 Subject: [PATCH] cleanup --- test/smoke/src/application.ts | 6 ------ test/smoke/src/areas/css/css.test.ts | 4 ---- test/smoke/src/areas/debug/debug.test.ts | 5 ----- test/smoke/src/areas/editor/editor.test.ts | 4 ---- test/smoke/src/areas/explorer/explorer.test.ts | 4 ---- test/smoke/src/areas/extensions/extensions.test.ts | 4 ---- test/smoke/src/areas/git/git.test.ts | 5 ----- test/smoke/src/areas/multiroot/multiroot.test.ts | 2 -- test/smoke/src/areas/preferences/preferences.test.ts | 4 ---- test/smoke/src/areas/search/search.test.ts | 4 ---- test/smoke/src/areas/statusbar/statusbar.test.ts | 4 ---- test/smoke/src/areas/workbench/data-loss.test.ts | 4 ---- test/smoke/src/areas/workbench/data-migration.test.ts | 6 ------ test/smoke/src/areas/workbench/localization.test.ts | 1 - 14 files changed, 57 deletions(-) diff --git a/test/smoke/src/application.ts b/test/smoke/src/application.ts index 5ab35ebb77d..d646c6c6e6a 100644 --- a/test/smoke/src/application.ts +++ b/test/smoke/src/application.ts @@ -71,12 +71,6 @@ export class SpectronApplication { return this.options.workspaceFilePath; } - private _suiteName: string = 'Init'; - - set suiteName(suiteName: string) { - this._suiteName = suiteName; - } - async start(waitForWelcome: boolean = true): Promise { await this._start(); diff --git a/test/smoke/src/areas/css/css.test.ts b/test/smoke/src/areas/css/css.test.ts index cce6027a184..ad0d7923b1a 100644 --- a/test/smoke/src/areas/css/css.test.ts +++ b/test/smoke/src/areas/css/css.test.ts @@ -8,10 +8,6 @@ import { ProblemSeverity, Problems } from '../problems/problems'; export function setup() { describe('CSS', () => { - before(function () { - this.app.suiteName = 'CSS'; - }); - it('verifies quick outline', async function () { const app = this.app as SpectronApplication; await app.workbench.quickopen.openFile('style.css'); diff --git a/test/smoke/src/areas/debug/debug.test.ts b/test/smoke/src/areas/debug/debug.test.ts index 392a8c87e48..edb1d58be46 100644 --- a/test/smoke/src/areas/debug/debug.test.ts +++ b/test/smoke/src/areas/debug/debug.test.ts @@ -12,11 +12,6 @@ import { SpectronApplication } from '../../application'; export function setup() { describe('Debug', () => { - before(async function () { - const app = this.app as SpectronApplication; - app.suiteName = 'Debug'; - }); - it('configure launch json', async function () { const app = this.app as SpectronApplication; diff --git a/test/smoke/src/areas/editor/editor.test.ts b/test/smoke/src/areas/editor/editor.test.ts index 4f7267fef95..5bc47218228 100644 --- a/test/smoke/src/areas/editor/editor.test.ts +++ b/test/smoke/src/areas/editor/editor.test.ts @@ -7,10 +7,6 @@ import { SpectronApplication } from '../../application'; export function setup() { describe('Editor', () => { - before(function () { - this.app.suiteName = 'Editor'; - }); - it('shows correct quick outline', async function () { const app = this.app as SpectronApplication; await app.workbench.quickopen.openFile('www'); diff --git a/test/smoke/src/areas/explorer/explorer.test.ts b/test/smoke/src/areas/explorer/explorer.test.ts index a18c7ec6f0c..5cde709ad74 100644 --- a/test/smoke/src/areas/explorer/explorer.test.ts +++ b/test/smoke/src/areas/explorer/explorer.test.ts @@ -7,10 +7,6 @@ import { SpectronApplication } from '../../application'; export function setup() { describe('Explorer', () => { - before(function () { - this.app.suiteName = 'Explorer'; - }); - it('quick open search produces correct result', async function () { const app = this.app as SpectronApplication; const expectedNames = [ diff --git a/test/smoke/src/areas/extensions/extensions.test.ts b/test/smoke/src/areas/extensions/extensions.test.ts index ca3c2820676..f9e324c77c3 100644 --- a/test/smoke/src/areas/extensions/extensions.test.ts +++ b/test/smoke/src/areas/extensions/extensions.test.ts @@ -8,10 +8,6 @@ import { SpectronApplication, Quality } from '../../application'; export function setup() { describe('Extensions', () => { - before(function () { - this.app.suiteName = 'Extensions'; - }); - it(`install and activate vscode-smoketest-check extension`, async function () { const app = this.app as SpectronApplication; diff --git a/test/smoke/src/areas/git/git.test.ts b/test/smoke/src/areas/git/git.test.ts index 1135877da50..9c89b77a5e2 100644 --- a/test/smoke/src/areas/git/git.test.ts +++ b/test/smoke/src/areas/git/git.test.ts @@ -11,11 +11,6 @@ const SYNC_STATUSBAR = 'div[id="workbench.parts.statusbar"] .statusbar-entry a[t export function setup() { describe('Git', () => { - before(async function () { - const app = this.app as SpectronApplication; - app.suiteName = 'Git'; - }); - it('reflects working tree changes', async function () { const app = this.app as SpectronApplication; diff --git a/test/smoke/src/areas/multiroot/multiroot.test.ts b/test/smoke/src/areas/multiroot/multiroot.test.ts index a5e1b9c9269..add575164a1 100644 --- a/test/smoke/src/areas/multiroot/multiroot.test.ts +++ b/test/smoke/src/areas/multiroot/multiroot.test.ts @@ -10,8 +10,6 @@ export function setup() { describe('Multiroot', () => { before(async function () { - this.app.suiteName = 'Multiroot'; - const app = this.app as SpectronApplication; // restart with preventing additional windows from restoring diff --git a/test/smoke/src/areas/preferences/preferences.test.ts b/test/smoke/src/areas/preferences/preferences.test.ts index 76bddda4621..21dde973031 100644 --- a/test/smoke/src/areas/preferences/preferences.test.ts +++ b/test/smoke/src/areas/preferences/preferences.test.ts @@ -10,10 +10,6 @@ import { ActivityBarPosition } from '../activitybar/activityBar'; export function setup() { describe('Preferences', () => { - before(function () { - this.app.suiteName = 'Preferences'; - }); - it('turns off editor line numbers and verifies the live change', async function () { const app = this.app as SpectronApplication; diff --git a/test/smoke/src/areas/search/search.test.ts b/test/smoke/src/areas/search/search.test.ts index caa3444efe4..9351c8fafe4 100644 --- a/test/smoke/src/areas/search/search.test.ts +++ b/test/smoke/src/areas/search/search.test.ts @@ -7,10 +7,6 @@ import { SpectronApplication } from '../../application'; export function setup() { describe('Search', () => { - before(function () { - this.app.suiteName = 'Search'; - }); - it('searches for body & checks for correct result number', async function () { const app = this.app as SpectronApplication; await app.workbench.search.openSearchViewlet(); diff --git a/test/smoke/src/areas/statusbar/statusbar.test.ts b/test/smoke/src/areas/statusbar/statusbar.test.ts index 24dce071f6c..78954928847 100644 --- a/test/smoke/src/areas/statusbar/statusbar.test.ts +++ b/test/smoke/src/areas/statusbar/statusbar.test.ts @@ -8,10 +8,6 @@ import { StatusBarElement } from './statusbar'; export function setup() { describe('Statusbar', () => { - before(function () { - this.app.suiteName = 'Statusbar'; - }); - it('verifies presence of all default status bar elements', async function () { const app = this.app as SpectronApplication; diff --git a/test/smoke/src/areas/workbench/data-loss.test.ts b/test/smoke/src/areas/workbench/data-loss.test.ts index 50d477f2803..2781d043ea4 100644 --- a/test/smoke/src/areas/workbench/data-loss.test.ts +++ b/test/smoke/src/areas/workbench/data-loss.test.ts @@ -7,10 +7,6 @@ import { SpectronApplication } from '../../application'; export function setup() { describe('Dataloss', () => { - before(function () { - this.app.suiteName = 'Dataloss'; - }); - it(`verifies that 'hot exit' works for dirty files`, async function () { const app = this.app as SpectronApplication; await app.workbench.editors.newUntitledFile(); diff --git a/test/smoke/src/areas/workbench/data-migration.test.ts b/test/smoke/src/areas/workbench/data-migration.test.ts index 3dc5a8e44d8..c48d216f80b 100644 --- a/test/smoke/src/areas/workbench/data-migration.test.ts +++ b/test/smoke/src/areas/workbench/data-migration.test.ts @@ -28,7 +28,6 @@ export function setup(userDataDir: string, createApp: ICreateAppFn) { } await stableApp.start(); - stableApp.suiteName = 'Data Migration'; const textToType = 'Very dirty file'; @@ -46,7 +45,6 @@ export function setup(userDataDir: string, createApp: ICreateAppFn) { } await app.start(false); - app.suiteName = 'Data Migration'; assert.ok(await app.workbench.editors.waitForActiveTab('Untitled-1', true), `Untitled-1 tab is not present after migration.`); @@ -64,7 +62,6 @@ export function setup(userDataDir: string, createApp: ICreateAppFn) { } await stableApp.start(); - stableApp.suiteName = 'Data Migration'; const fileName = 'app.js'; const textPart = 'This is going to be an unsaved file'; @@ -84,7 +81,6 @@ export function setup(userDataDir: string, createApp: ICreateAppFn) { } await app.start(false); - app.suiteName = 'Data Migration'; assert.ok(await app.workbench.editors.waitForActiveTab(fileName), `dirty file tab is not present after migration.`); await app.workbench.editor.waitForEditorContents(fileName, c => c.indexOf(textPart) > -1); @@ -101,7 +97,6 @@ export function setup(userDataDir: string, createApp: ICreateAppFn) { } await stableApp.start(); - stableApp.suiteName = 'Data Migration'; const fileName1 = 'app.js', fileName2 = 'jsconfig.json', fileName3 = 'readme.md'; @@ -119,7 +114,6 @@ export function setup(userDataDir: string, createApp: ICreateAppFn) { } await app.start(false); - app.suiteName = 'Data Migration'; assert.ok(await app.workbench.editors.waitForTab(fileName1), `${fileName1} tab was not restored after migration.`); assert.ok(await app.workbench.editors.waitForTab(fileName2), `${fileName2} tab was not restored after migration.`); diff --git a/test/smoke/src/areas/workbench/localization.test.ts b/test/smoke/src/areas/workbench/localization.test.ts index a39722858e4..2a41c77ea20 100644 --- a/test/smoke/src/areas/workbench/localization.test.ts +++ b/test/smoke/src/areas/workbench/localization.test.ts @@ -11,7 +11,6 @@ export function setup() { describe('Localization', () => { before(async function () { const app = this.app as SpectronApplication; - this.app.suiteName = 'Localization'; if (app.quality === Quality.Dev) { return; -- GitLab