Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename "unit test" to "tests" from drop menu when clicking on "Run Tests" on the status bar, rename "Discover tests" to "Discovering" #5888

Merged
merged 3 commits into from
Jun 4, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions news/1 Enhancements/4562.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Change title of `Discover Tests` to `Discovering` when discovering tests
1 change: 1 addition & 0 deletions news/1 Enhancements/5832.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Change pytest description from configuration menu
1 change: 1 addition & 0 deletions news/3 Code Health/5605.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Rename "unit test" to "tests" from drop menu when clicking on "Run Tests" on the status bar
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@
},
{
"command": "python.discoveringTests",
"title": "%python.command.python.discoverTests.title%",
"title": "%python.command.python.discoveringTests.title%",
"category": "Python",
"icon": {
"light": "resources/light/discovering-tests.svg",
Expand Down Expand Up @@ -1894,7 +1894,7 @@
"python.testing.cwd": {
"type": "string",
"default": null,
"description": "Optional working directory for unit tests.",
"description": "Optional working directory for tests.",
"scope": "resource"
},
"python.testing.debugPort": {
Expand All @@ -1915,7 +1915,7 @@
"python.testing.nosetestsEnabled": {
"type": "boolean",
"default": false,
"description": "Enable unit testing using nosetests.",
"description": "Enable testing using nosetests.",
"scope": "resource"
},
"python.testing.nosetestPath": {
Expand Down Expand Up @@ -1969,13 +1969,13 @@
"python.testing.unittestEnabled": {
"type": "boolean",
"default": false,
"description": "Enable unit testing using unittest.",
"description": "Enable testing using unittest.",
"scope": "resource"
},
"python.testing.autoTestDiscoverOnSaveEnabled": {
"type": "boolean",
"default": true,
"description": "Enable auto run test discovery when saving a unit test file.",
"description": "Enable auto run test discovery when saving a test file.",
"scope": "resource"
},
"python.venvFolders": {
Expand Down
5 changes: 3 additions & 2 deletions package.nls.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"python.command.python.runCurrentTestFile.title": "Run Current Test File",
"python.command.python.runFailedTests.title": "Run Failed Tests",
"python.command.python.discoverTests.title": "Discover Tests",
"python.command.python.discoveringTests.title": "Discovering...",
"python.command.python.stopTests.title": "Stop",
"python.command.python.configureTests.title": "Configure Tests",
"python.command.python.execSelectionInTerminal.title": "Run Selection/Line in Python Terminal",
Expand Down Expand Up @@ -239,13 +240,13 @@
"Common.gotIt": "Got it!",
"Interpreters.selectInterpreterTip": "Tip: you can change the Python interpreter used by the Python extension by clicking on the Python version in the status bar",
"DataScience.noRowsInVariableExplorer": "No variables defined",
"DataScience.tooManyColumnsMessage" : "Variables with over a 1000 columns may take a long time to display. Are you sure you wish to continue?",
"DataScience.tooManyColumnsMessage": "Variables with over a 1000 columns may take a long time to display. Are you sure you wish to continue?",
"DataScience.tooManyColumnsYes": "Yes",
"DataScience.tooManyColumnsNo": "No",
"DataScience.tooManyColumnsDontAskAgain": "Don't Ask Again",
"DataScience.filterRowsButton": "Filter Rows",
"DataScience.filterRowsTooltip": "Allows filtering multiple rows. Use =, >, or < signs to filter numeric values.",
"DataScience.previewHeader" : "--- Begin preview of {0} ---",
"DataScience.previewHeader": "--- Begin preview of {0} ---",
"DataScience.previewFooter": "--- End preview of {0} ---",
"DataScience.previewStatusMessage": "Generating preview of {0}"
}
2 changes: 1 addition & 1 deletion src/client/testing/configuration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export class UnitTestConfigurationService implements ITestConfigurationService {
{
label: 'pytest',
product: Product.pytest,
description: 'Can run unittest (including trial) and nose test suites out of the box',
description: 'pytest framework',
// tslint:disable-next-line:no-http-string
detail: 'http://docs.pytest.org/'
},
Expand Down
10 changes: 5 additions & 5 deletions src/client/testing/display/picker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -124,13 +124,13 @@ function getSummary(tests?: Tests) {
}
function buildItems(tests?: Tests): TestItem[] {
const items: TestItem[] = [];
items.push({ description: '', label: 'Run All Unit Tests', type: Type.RunAll });
items.push({ description: '', label: 'Discover Unit Tests', type: Type.ReDiscover });
items.push({ description: '', label: 'Run Unit Test Method ...', type: Type.SelectAndRunMethod });
items.push({ description: '', label: 'Configure Unit Tests', type: Type.Configure });
items.push({ description: '', label: 'Run All Tests', type: Type.RunAll });
items.push({ description: '', label: 'Discover Tests', type: Type.ReDiscover });
items.push({ description: '', label: 'Run Test Method ...', type: Type.SelectAndRunMethod });
items.push({ description: '', label: 'Configure Tests', type: Type.Configure });

const summary = getSummary(tests);
items.push({ description: '', label: 'View Unit Test Output', type: Type.ViewTestOutput, detail: summary });
items.push({ description: '', label: 'View Test Output', type: Type.ViewTestOutput, detail: summary });

if (tests && tests.summary.failures > 0) {
items.push({ description: '', label: 'Run Failed Tests', type: Type.RunFailed, detail: `${constants.Octicons.Test_Fail} ${tests.summary.failures} Failed` });
Expand Down