From bf6366cef4ce45ccd7f73d0c612cf81da6080624 Mon Sep 17 00:00:00 2001 From: Martin Fournier Date: Wed, 26 Jan 2022 05:13:38 -0500 Subject: [PATCH 1/4] Move markdown doc & quotes to ./docs subfolder --- README.md | 6 +++--- BN14.md => doc/BN14.md | 0 CONTRIBUTING.md => doc/CONTRIBUTING.md | 2 +- FAQ.md => doc/FAQ.md | 0 Quotes.txt => doc/Quotes.txt | 0 doc/source/gamefrozen.rst | 2 +- src/Themes/README.md | 2 +- 7 files changed, 6 insertions(+), 6 deletions(-) rename BN14.md => doc/BN14.md (100%) rename CONTRIBUTING.md => doc/CONTRIBUTING.md (97%) rename FAQ.md => doc/FAQ.md (100%) rename Quotes.txt => doc/Quotes.txt (100%) diff --git a/README.md b/README.md index 9a239435b..0401f18f6 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Bitburner is a programming-based [incremental game](https://en.wikipedia.org/wik that revolves around hacking and cyberpunk themes. The game can be played at https://danielyxie.github.io/bitburner or installed through [Steam](https://store.steampowered.com/app/1812820/Bitburner/). -See the [frequently asked questions](./FAQ.md) for more information . To discuss the game or get help, join the [official discord server](https://discord.gg/TFc3hKD) +See the [frequently asked questions](./doc/FAQ.md) for more information . To discuss the game or get help, join the [official discord server](https://discord.gg/TFc3hKD) # Documentation @@ -18,13 +18,13 @@ The [in-game documentation](./markdown/bitburner.md) is generated from the [Type Anyone is welcome to contribute to the documentation by editing the [source files](/doc/source) and then making a pull request with your contributions. For further guidance, please refer to the "As A Documentor" section of -[CONTRIBUTING](CONTRIBUTING.md). +[CONTRIBUTING](./doc/CONTRIBUTING.md). # Contribution There are many ways to contribute to the game. It can be as simple as fixing a typo, correcting a bug, or improving the UI. For guidance on doing so, -please refer to the [CONTRIBUTING](CONTRIBUTING.md) document. +please refer to the [CONTRIBUTING](./doc/CONTRIBUTING.md) document. You will retain all ownership of the Copyright of any contributions you make, and will have the same rights to use or license your contributions. By diff --git a/BN14.md b/doc/BN14.md similarity index 100% rename from BN14.md rename to doc/BN14.md diff --git a/CONTRIBUTING.md b/doc/CONTRIBUTING.md similarity index 97% rename from CONTRIBUTING.md rename to doc/CONTRIBUTING.md index a6cfd9dbd..71ec878f8 100644 --- a/CONTRIBUTING.md +++ b/doc/CONTRIBUTING.md @@ -182,7 +182,7 @@ To contribute to and view your changes to the BitBurner documentation on [Read T Docs](http://bitburner.readthedocs.io/), you will need to have Python installed, along with [Sphinx](http://www.sphinx-doc.org). -To make change to the [in-game documentation](./markdown/bitburner.md), you will need to modify the [TypeScript definitions](./src/ScriptEditor/NetscriptDefinitions.d.ts), not the markdown files. +To make change to the [in-game documentation](../markdown/bitburner.md), you will need to modify the [TypeScript definitions](../src/ScriptEditor/NetscriptDefinitions.d.ts), not the markdown files. We are using [API Extractor](https://api-extractor.com/pages/tsdoc/doc_comment_syntax/) (tsdoc hints) to generate the markdown doc. Make your changes to the TypeScript definitions and then run `npm run doc`. diff --git a/FAQ.md b/doc/FAQ.md similarity index 100% rename from FAQ.md rename to doc/FAQ.md diff --git a/Quotes.txt b/doc/Quotes.txt similarity index 100% rename from Quotes.txt rename to doc/Quotes.txt diff --git a/doc/source/gamefrozen.rst b/doc/source/gamefrozen.rst index 7b29bb448..03876ae09 100644 --- a/doc/source/gamefrozen.rst +++ b/doc/source/gamefrozen.rst @@ -23,4 +23,4 @@ Bug --- Otherwise, the game is probably frozen/stuck due to a bug. To report a bug, follow -the guidelines `here `_. +the guidelines `here `_. diff --git a/src/Themes/README.md b/src/Themes/README.md index 3dffe710d..160d75e05 100644 --- a/src/Themes/README.md +++ b/src/Themes/README.md @@ -2,7 +2,7 @@ Feel free to contribute a new theme by submitting a pull request to the game! -See [CONTRIBUTING.md](/CONTRIBUTING.md) for details. +See [CONTRIBUTING.md](/doc/CONTRIBUTING.md) for details. ## How create a new theme From a53e0c09af5fcfd8e610decaa25ceed5bd75a5b1 Mon Sep 17 00:00:00 2001 From: Martin Fournier Date: Wed, 26 Jan 2022 05:14:25 -0500 Subject: [PATCH 2/4] Move steam files to ./assets/Steam subfolder --- steam_api.dll => assets/Steam/steam_api.dll | Bin steam_api.lib => assets/Steam/steam_api.lib | Bin steam_appid.txt => assets/Steam/steam_appid.txt | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename steam_api.dll => assets/Steam/steam_api.dll (100%) rename steam_api.lib => assets/Steam/steam_api.lib (100%) rename steam_appid.txt => assets/Steam/steam_appid.txt (100%) diff --git a/steam_api.dll b/assets/Steam/steam_api.dll similarity index 100% rename from steam_api.dll rename to assets/Steam/steam_api.dll diff --git a/steam_api.lib b/assets/Steam/steam_api.lib similarity index 100% rename from steam_api.lib rename to assets/Steam/steam_api.lib diff --git a/steam_appid.txt b/assets/Steam/steam_appid.txt similarity index 100% rename from steam_appid.txt rename to assets/Steam/steam_appid.txt From f943e55e8667c424d7caece11bfae6580a7d78e5 Mon Sep 17 00:00:00 2001 From: Martin Fournier Date: Tue, 25 Jan 2022 16:38:54 -0500 Subject: [PATCH 3/4] Move engines-check to ./tools subfolder --- .eslintignore | 2 +- package.json | 2 +- {scripts => tools/engines-check}/.eslintrc.js | 0 {scripts => tools/engines-check}/engines-check.js | 0 {scripts => tools/engines-check}/semver.js | 0 5 files changed, 2 insertions(+), 2 deletions(-) rename {scripts => tools/engines-check}/.eslintrc.js (100%) rename {scripts => tools/engines-check}/engines-check.js (100%) rename {scripts => tools/engines-check}/semver.js (100%) diff --git a/.eslintignore b/.eslintignore index 198118748..716b1faae 100644 --- a/.eslintignore +++ b/.eslintignore @@ -13,7 +13,7 @@ cypress/ doc/ markdown/ netscript_tests/ -scripts/ +tools/engines-check/ electron/lib electron/greenworks.js diff --git a/package.json b/package.json index 6164663fa..a2f22e671 100644 --- a/package.json +++ b/package.json @@ -113,7 +113,7 @@ "build:dev": "webpack --mode development", "lint": "eslint --fix . --ext js,jsx,ts,tsx", "lint:report": "eslint --ext js,jsx,ts,tsx .", - "preinstall": "node ./scripts/engines-check.js", + "preinstall": "node ./tools/engines-check/engines-check.js", "test": "jest", "test:watch": "jest --watch", "watch": "webpack --watch --mode production", diff --git a/scripts/.eslintrc.js b/tools/engines-check/.eslintrc.js similarity index 100% rename from scripts/.eslintrc.js rename to tools/engines-check/.eslintrc.js diff --git a/scripts/engines-check.js b/tools/engines-check/engines-check.js similarity index 100% rename from scripts/engines-check.js rename to tools/engines-check/engines-check.js diff --git a/scripts/semver.js b/tools/engines-check/semver.js similarity index 100% rename from scripts/semver.js rename to tools/engines-check/semver.js From 8e119b2b5b55b17b56dda504591c9575fda7bb0b Mon Sep 17 00:00:00 2001 From: Martin Fournier Date: Tue, 25 Jan 2022 16:24:09 -0500 Subject: [PATCH 4/4] Move cypress & netscript tests to ./test subfolder --- .eslintignore | 19 ++++++------ cypress.json | 12 +++++--- .../cypress}/integration/naviguation.spec.ts | 0 .../cypress}/integration/netscript.spec.ts | 0 .../cypress}/integration/tutorial.spec.ts | 0 {cypress => test/cypress}/plugins/index.js | 0 {cypress => test/cypress}/support/commands.ts | 0 .../cypress}/support/globalHooks.ts | 0 {cypress => test/cypress}/support/index.js | 0 .../Netscript/DynamicRamCalculation.test.js | 14 ++++----- .../Netscript/StaticRamCalculation.test.js | 6 ++-- test/{ => jest}/README.md | 0 test/{ => jest}/Script/Script.test.ts | 6 ++-- test/{ => jest}/StockMarket.test.ts | 30 +++++++++---------- test/{ => jest}/StringHelperFunctions.test.ts | 2 +- test/{ => jest}/Terminal/Directory.test.js | 2 +- ...neAllPossibilitiesForTabCompletion.test.ts | 12 ++++---- .../netscript}/tb_basic.script | 0 .../netscript}/tb_foo.script | 0 .../netscript}/tb_functions.script | 0 .../netscript}/tb_multiarray.script | 0 .../netscript}/tb_ports.script | 0 .../netscript}/tb_remote.script | 0 .../netscript}/tb_start.script | 0 24 files changed, 53 insertions(+), 50 deletions(-) rename {cypress => test/cypress}/integration/naviguation.spec.ts (100%) rename {cypress => test/cypress}/integration/netscript.spec.ts (100%) rename {cypress => test/cypress}/integration/tutorial.spec.ts (100%) rename {cypress => test/cypress}/plugins/index.js (100%) rename {cypress => test/cypress}/support/commands.ts (100%) rename {cypress => test/cypress}/support/globalHooks.ts (100%) rename {cypress => test/cypress}/support/index.js (100%) rename test/{ => jest}/Netscript/DynamicRamCalculation.test.js (98%) rename test/{ => jest}/Netscript/StaticRamCalculation.test.js (99%) rename test/{ => jest}/README.md (100%) rename test/{ => jest}/Script/Script.test.ts (88%) rename test/{ => jest}/StockMarket.test.ts (98%) rename test/{ => jest}/StringHelperFunctions.test.ts (92%) rename test/{ => jest}/Terminal/Directory.test.js (99%) rename test/{ => jest}/Terminal/determineAllPossibilitiesForTabCompletion.test.ts (94%) rename {netscript_tests => test/netscript}/tb_basic.script (100%) rename {netscript_tests => test/netscript}/tb_foo.script (100%) rename {netscript_tests => test/netscript}/tb_functions.script (100%) rename {netscript_tests => test/netscript}/tb_multiarray.script (100%) rename {netscript_tests => test/netscript}/tb_ports.script (100%) rename {netscript_tests => test/netscript}/tb_remote.script (100%) rename {netscript_tests => test/netscript}/tb_start.script (100%) diff --git a/.eslintignore b/.eslintignore index 716b1faae..9f6599e8c 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,27 +1,26 @@ node_modules/ -dist/ -input/ .dist .tmp .package - -assets/ -css/ +.build .cypress/ -cypress/ + +dist/ +input/ +assets/ doc/ markdown/ -netscript_tests/ -tools/engines-check/ + + +test/netscript/ electron/lib electron/greenworks.js src/ThirdParty/* src/JSInterpreter.js +tools/engines-check/ -test/*.bundle.* editor.main.js main.bundle.js webpack.config.js -webpack.config-test.js diff --git a/cypress.json b/cypress.json index 97707ced4..269aac154 100644 --- a/cypress.json +++ b/cypress.json @@ -1,10 +1,14 @@ { "baseUrl": "http://localhost:8000", - "fixturesFolder": false, "trashAssetsBeforeRuns": true, - "screenshotsFolder": ".cypress/screenshots", - "videosFolder": ".cypress/videos", "videoUploadOnPasses": false, "viewportWidth": 1980, - "viewportHeight": 1080 + "viewportHeight": 1080, + "fixturesFolder": "test/cypress/fixtures", + "integrationFolder": "test/cypress/integration", + "pluginsFile": "test/cypress/plugins/index.js", + "supportFile": "test/cypress/support/index.js", + "screenshotsFolder": ".cypress/screenshots", + "videosFolder": ".cypress/videos", + "downloadsFolder": ".cypress/downloads" } diff --git a/cypress/integration/naviguation.spec.ts b/test/cypress/integration/naviguation.spec.ts similarity index 100% rename from cypress/integration/naviguation.spec.ts rename to test/cypress/integration/naviguation.spec.ts diff --git a/cypress/integration/netscript.spec.ts b/test/cypress/integration/netscript.spec.ts similarity index 100% rename from cypress/integration/netscript.spec.ts rename to test/cypress/integration/netscript.spec.ts diff --git a/cypress/integration/tutorial.spec.ts b/test/cypress/integration/tutorial.spec.ts similarity index 100% rename from cypress/integration/tutorial.spec.ts rename to test/cypress/integration/tutorial.spec.ts diff --git a/cypress/plugins/index.js b/test/cypress/plugins/index.js similarity index 100% rename from cypress/plugins/index.js rename to test/cypress/plugins/index.js diff --git a/cypress/support/commands.ts b/test/cypress/support/commands.ts similarity index 100% rename from cypress/support/commands.ts rename to test/cypress/support/commands.ts diff --git a/cypress/support/globalHooks.ts b/test/cypress/support/globalHooks.ts similarity index 100% rename from cypress/support/globalHooks.ts rename to test/cypress/support/globalHooks.ts diff --git a/cypress/support/index.js b/test/cypress/support/index.js similarity index 100% rename from cypress/support/index.js rename to test/cypress/support/index.js diff --git a/test/Netscript/DynamicRamCalculation.test.js b/test/jest/Netscript/DynamicRamCalculation.test.js similarity index 98% rename from test/Netscript/DynamicRamCalculation.test.js rename to test/jest/Netscript/DynamicRamCalculation.test.js index 1a926ee37..55f69203d 100644 --- a/test/Netscript/DynamicRamCalculation.test.js +++ b/test/jest/Netscript/DynamicRamCalculation.test.js @@ -1,13 +1,13 @@ // eslint-disable-next-line @typescript-eslint/no-unused-vars import { jest, describe, expect, test } from "@jest/globals"; -import { Player } from "../../src/Player"; -import { NetscriptFunctions } from "../../src/NetscriptFunctions"; -import { getRamCost, RamCostConstants } from "../../src/Netscript/RamCostGenerator"; -import { Environment } from "../../src/Netscript/Environment"; -import { RunningScript } from "../../src/Script/RunningScript"; -import { Script } from "../../src/Script/Script"; -import { SourceFileFlags } from "../../src/SourceFile/SourceFileFlags"; +import { Player } from "../../../src/Player"; +import { NetscriptFunctions } from "../../../src/NetscriptFunctions"; +import { getRamCost, RamCostConstants } from "../../../src/Netscript/RamCostGenerator"; +import { Environment } from "../../../src/Netscript/Environment"; +import { RunningScript } from "../../../src/Script/RunningScript"; +import { Script } from "../../../src/Script/Script"; +import { SourceFileFlags } from "../../../src/SourceFile/SourceFileFlags"; jest.mock(`!!raw-loader!../NetscriptDefinitions.d.ts`, () => "", { virtual: true, diff --git a/test/Netscript/StaticRamCalculation.test.js b/test/jest/Netscript/StaticRamCalculation.test.js similarity index 99% rename from test/Netscript/StaticRamCalculation.test.js rename to test/jest/Netscript/StaticRamCalculation.test.js index 31bff7e1c..4e615100e 100644 --- a/test/Netscript/StaticRamCalculation.test.js +++ b/test/jest/Netscript/StaticRamCalculation.test.js @@ -1,9 +1,9 @@ // eslint-disable-next-line @typescript-eslint/no-unused-vars import { jest, describe, expect } from "@jest/globals"; -import { Player } from "../../src/Player"; -import { getRamCost, RamCostConstants } from "../../src/Netscript/RamCostGenerator"; -import { calculateRamUsage } from "../../src/Script/RamCalculations"; +import { Player } from "../../../src/Player"; +import { getRamCost, RamCostConstants } from "../../../src/Netscript/RamCostGenerator"; +import { calculateRamUsage } from "../../../src/Script/RamCalculations"; jest.mock(`!!raw-loader!../NetscriptDefinitions.d.ts`, () => "", { virtual: true, diff --git a/test/README.md b/test/jest/README.md similarity index 100% rename from test/README.md rename to test/jest/README.md diff --git a/test/Script/Script.test.ts b/test/jest/Script/Script.test.ts similarity index 88% rename from test/Script/Script.test.ts rename to test/jest/Script/Script.test.ts index f0914d3c8..82c6d3b11 100644 --- a/test/Script/Script.test.ts +++ b/test/jest/Script/Script.test.ts @@ -1,8 +1,8 @@ // eslint-disable-next-line @typescript-eslint/no-unused-vars import { jest, describe, expect, test } from "@jest/globals"; -import { Script } from "../../src/Script/Script"; -import { Player } from "../../src/Player"; +import { Script } from "../../../src/Script/Script"; +import { Player } from "../../../src/Player"; jest.mock(`!!raw-loader!../NetscriptDefinitions.d.ts`, () => "", { virtual: true, @@ -26,4 +26,4 @@ describe("Validate Save Script Works", function () { expect(script.code).toEqual(code) expect(script.server).toEqual(server) }); -}); \ No newline at end of file +}); diff --git a/test/StockMarket.test.ts b/test/jest/StockMarket.test.ts similarity index 98% rename from test/StockMarket.test.ts rename to test/jest/StockMarket.test.ts index 92c2d720f..2abc16ea9 100644 --- a/test/StockMarket.test.ts +++ b/test/jest/StockMarket.test.ts @@ -1,25 +1,25 @@ // eslint-disable-next-line @typescript-eslint/no-unused-vars import { jest, describe, expect, test } from '@jest/globals' -import { CONSTANTS } from "../src/Constants"; -import { Player } from "../src/Player"; -import { IMap } from "../src/types"; +import { CONSTANTS } from "../../src/Constants"; +import { Player } from "../../src/Player"; +import { IMap } from "../../src/types"; -import { Company } from "../src/Company/Company"; -import { Server } from "../src/Server/Server"; +import { Company } from "../../src/Company/Company"; +import { Server } from "../../src/Server/Server"; -import { buyStock, sellStock, shortStock, sellShort } from "../src/StockMarket/BuyingAndSelling"; -import { IStockMarket } from "../src/StockMarket/IStockMarket"; -import { Order } from "../src/StockMarket/Order"; +import { buyStock, sellStock, shortStock, sellShort } from "../../src/StockMarket/BuyingAndSelling"; +import { IStockMarket } from "../../src/StockMarket/IStockMarket"; +import { Order } from "../../src/StockMarket/Order"; import { forecastForecastChangeFromCompanyWork, forecastForecastChangeFromHack, influenceStockThroughCompanyWork, influenceStockThroughServerGrow, influenceStockThroughServerHack, -} from "../src/StockMarket/PlayerInfluencing"; -import { processOrders, IProcessOrderRefs } from "../src/StockMarket/OrderProcessing"; -import { Stock, StockForecastInfluenceLimit } from "../src/StockMarket/Stock"; +} from "../../src/StockMarket/PlayerInfluencing"; +import { processOrders, IProcessOrderRefs } from "../../src/StockMarket/OrderProcessing"; +import { Stock, StockForecastInfluenceLimit } from "../../src/StockMarket/Stock"; import { cancelOrder, deleteStockMarket, @@ -29,15 +29,15 @@ import { processStockPrices, StockMarket, SymbolToStockMap, -} from "../src/StockMarket/StockMarket"; +} from "../../src/StockMarket/StockMarket"; import { forecastChangePerPriceMovement, getBuyTransactionCost, getSellTransactionGain, processTransactionForecastMovement, -} from "../src/StockMarket/StockMarketHelpers"; -import { OrderTypes } from "../src/StockMarket/data/OrderTypes"; -import { PositionTypes } from "../src/StockMarket/data/PositionTypes"; +} from "../../src/StockMarket/StockMarketHelpers"; +import { OrderTypes } from "../../src/StockMarket/data/OrderTypes"; +import { PositionTypes } from "../../src/StockMarket/data/PositionTypes"; jest.mock(`!!raw-loader!../NetscriptDefinitions.d.ts`, () => '', { virtual: true, diff --git a/test/StringHelperFunctions.test.ts b/test/jest/StringHelperFunctions.test.ts similarity index 92% rename from test/StringHelperFunctions.test.ts rename to test/jest/StringHelperFunctions.test.ts index 637963c6a..ee6d21dec 100644 --- a/test/StringHelperFunctions.test.ts +++ b/test/jest/StringHelperFunctions.test.ts @@ -1,6 +1,6 @@ // eslint-disable-next-line @typescript-eslint/no-unused-vars import { jest, describe, expect, test } from '@jest/globals' -import { convertTimeMsToTimeElapsedString } from "../src/utils/StringHelperFunctions"; +import { convertTimeMsToTimeElapsedString } from "../../src/utils/StringHelperFunctions"; describe("StringHelperFunctions Tests", function () { it("transforms strings", () => { diff --git a/test/Terminal/Directory.test.js b/test/jest/Terminal/Directory.test.js similarity index 99% rename from test/Terminal/Directory.test.js rename to test/jest/Terminal/Directory.test.js index a054be567..6ecc529bf 100644 --- a/test/Terminal/Directory.test.js +++ b/test/jest/Terminal/Directory.test.js @@ -1,6 +1,6 @@ // eslint-disable-next-line @typescript-eslint/no-unused-vars import { jest, describe, expect, test } from '@jest/globals' -import * as dirHelpers from "../../src/Terminal/DirectoryHelpers"; +import * as dirHelpers from "../../../src/Terminal/DirectoryHelpers"; describe("Terminal Directory Tests", function () { describe("removeLeadingSlash()", function () { diff --git a/test/Terminal/determineAllPossibilitiesForTabCompletion.test.ts b/test/jest/Terminal/determineAllPossibilitiesForTabCompletion.test.ts similarity index 94% rename from test/Terminal/determineAllPossibilitiesForTabCompletion.test.ts rename to test/jest/Terminal/determineAllPossibilitiesForTabCompletion.test.ts index 513d0809c..52da0ad7a 100644 --- a/test/Terminal/determineAllPossibilitiesForTabCompletion.test.ts +++ b/test/jest/Terminal/determineAllPossibilitiesForTabCompletion.test.ts @@ -2,12 +2,12 @@ // eslint-disable-next-line @typescript-eslint/no-unused-vars import { jest, describe, expect, test } from "@jest/globals"; -import { Player } from "../../src/Player"; -import { determineAllPossibilitiesForTabCompletion } from "../../src/Terminal/determineAllPossibilitiesForTabCompletion"; -import { Server } from "../../src/Server/Server"; -import { AddToAllServers, prestigeAllServers } from "../../src/Server/AllServers"; -import { LocationName } from "../../src/Locations/data/LocationNames"; -import { CodingContract } from "../../src/CodingContracts"; +import { Player } from "../../../src/Player"; +import { determineAllPossibilitiesForTabCompletion } from "../../../src/Terminal/determineAllPossibilitiesForTabCompletion"; +import { Server } from "../../../src/Server/Server"; +import { AddToAllServers, prestigeAllServers } from "../../../src/Server/AllServers"; +import { LocationName } from "../../../src/Locations/data/LocationNames"; +import { CodingContract } from "../../../src/CodingContracts"; jest.mock(`!!raw-loader!../NetscriptDefinitions.d.ts`, () => "", { virtual: true, diff --git a/netscript_tests/tb_basic.script b/test/netscript/tb_basic.script similarity index 100% rename from netscript_tests/tb_basic.script rename to test/netscript/tb_basic.script diff --git a/netscript_tests/tb_foo.script b/test/netscript/tb_foo.script similarity index 100% rename from netscript_tests/tb_foo.script rename to test/netscript/tb_foo.script diff --git a/netscript_tests/tb_functions.script b/test/netscript/tb_functions.script similarity index 100% rename from netscript_tests/tb_functions.script rename to test/netscript/tb_functions.script diff --git a/netscript_tests/tb_multiarray.script b/test/netscript/tb_multiarray.script similarity index 100% rename from netscript_tests/tb_multiarray.script rename to test/netscript/tb_multiarray.script diff --git a/netscript_tests/tb_ports.script b/test/netscript/tb_ports.script similarity index 100% rename from netscript_tests/tb_ports.script rename to test/netscript/tb_ports.script diff --git a/netscript_tests/tb_remote.script b/test/netscript/tb_remote.script similarity index 100% rename from netscript_tests/tb_remote.script rename to test/netscript/tb_remote.script diff --git a/netscript_tests/tb_start.script b/test/netscript/tb_start.script similarity index 100% rename from netscript_tests/tb_start.script rename to test/netscript/tb_start.script