feat(core): Adds lcov report, and moves test files to brighterscript

rokucommunity · May 5, 2020 · 99b8d50 · 99b8d50
1 parent 0cfb918
commit 99b8d50
Show file tree

Hide file tree

Showing 21 changed files with 1,287 additions and 1,322 deletions.
diff --git a/frameworkTests/source/main.brs → frameworkTests/source/main.bs b/frameworkTests/source/main.brs → frameworkTests/source/main.bs
diff --git a/...workTests/source/tests/AssertionTests.brs → ...eworkTests/source/tests/AssertionTests.bs b/...workTests/source/tests/AssertionTests.brs → ...eworkTests/source/tests/AssertionTests.bs
diff --git a/frameworkTests/source/tests/BasicTests.brs → frameworkTests/source/tests/BasicTests.bs b/frameworkTests/source/tests/BasicTests.brs → frameworkTests/source/tests/BasicTests.bs
diff --git a/frameworkTests/source/tests/ExpectTests.brs b/frameworkTests/source/tests/ExpectTests.brs
diff --git a/frameworkTests/source/tests/MatcherTests.brs → frameworkTests/source/tests/MatcherTests.bs b/frameworkTests/source/tests/MatcherTests.brs → frameworkTests/source/tests/MatcherTests.bs
diff --git a/frameworkTests/source/tests/ParamsTests.brs → frameworkTests/source/tests/ParamsTests.bs b/frameworkTests/source/tests/ParamsTests.brs → frameworkTests/source/tests/ParamsTests.bs
diff --git a/frameworkTests/source/tests/VersionTests.brs → frameworkTests/source/tests/VersionTests.bs b/frameworkTests/source/tests/VersionTests.brs → frameworkTests/source/tests/VersionTests.bs
diff --git a/.../tests/issue_13_afterEach_not_running.brs → ...e/tests/issue_13_afterEach_not_running.bs b/.../tests/issue_13_afterEach_not_running.brs → ...e/tests/issue_13_afterEach_not_running.bs
@@ -1,3 +1,4 @@
+'@Ignore - only unignore to test compiler works
 '@TestSuite [DGNT] Duplicate Group Name Tests
 
 '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

diff --git a/...e/tests/issue_15_tests_only_on_groups.brs → ...ce/tests/issue_15_tests_only_on_groups.bs b/...e/tests/issue_15_tests_only_on_groups.brs → ...ce/tests/issue_15_tests_only_on_groups.bs
diff --git a/...rce/tests/issue_5_duplicateGroupNames.brs → ...urce/tests/issue_5_duplicateGroupNames.bs b/...rce/tests/issue_5_duplicateGroupNames.brs → ...urce/tests/issue_5_duplicateGroupNames.bs
@@ -1,4 +1,5 @@
-'@TestSuite [RBSA] Rooibos before after tests
+'@Ignore - only unignore to test compiler works - remove REMOVE_THIS to test
+'@TestSuite [RBSA] REMOVE_THIS Rooibos before after tests
 
 '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 '@It tests before each and after each are running

diff --git a/frameworkTests/source/tests/testUtils.brs → frameworkTests/source/tests/testUtils.bs b/frameworkTests/source/tests/testUtils.brs → frameworkTests/source/tests/testUtils.bs
diff --git a/...ource/tests/verifyBeforeEachAfterEach.brs → ...source/tests/verifyBeforeEachAfterEach.bs b/...ource/tests/verifyBeforeEachAfterEach.brs → ...source/tests/verifyBeforeEachAfterEach.bs
diff --git a/gulpfile.ts b/gulpfile.ts
@@ -1,9 +1,6 @@
 import { series } from "gulp";
 import { RooibosProcessor, createProcessorConfig } from "rooibos-cli";
 import { MaestroProjectProcessor, createMaestroConfig } from 'maestro-cli-roku';
-import { config } from 'dotenv';
-
-config(__dirname, '.env');
 
 const concat = require('gulp-concat');
 const gulp = require('gulp');
@@ -46,11 +43,50 @@ function createDirectories() {
 export async function compile(cb) {
   let config = createMaestroConfig({
     filePattern: ['**/*.bs', '**/*.brs', '**/*.xml'],
-    sourcePath: `src`,
+    sourcePaths: [`frameworkTests`],
     outputPath: buildDir,
     logLevel: 4,
+    processingExcludedPaths: [
+      'components/rLogComponents/**/*.*',
+      'source/rLog/**/*.*',
+      'source/tests/rooibosDist.brs',
+      'source/tests/rooibosFunctionMap.brs',
+      'source/AdobeAccessEnabler/adobeAuthorizationTemplate.xml'
+    ],
     nonCheckedImports: [
-    ]
+      'source/zapp.brs',
+      'source/MRuntime.brs',
+      'source/rLog/rLogMixin.brs',
+      'source/tests/rooibosDist.brs',
+      'source/rooibosFunctionMap.brs'
+    ],
+    createRuntimeFiles: false
+  });
+  let processor = new MaestroProjectProcessor(config);
+  await processor.processFiles();
+}
+
+export async function compileFramework(cb) {
+  let config = createMaestroConfig({
+    filePattern: ['**/*.bs', '**/*.brs', '**/*.xml'],
+    sourcePaths: [`src`],
+    outputPath: buildDir,
+    logLevel: 4,
+    processingExcludedPaths: [
+      'components/rLogComponents/**/*.*',
+      'source/rLog/**/*.*',
+      'source/tests/rooibosDist.brs',
+      'source/tests/rooibosFunctionMap.brs',
+      'source/AdobeAccessEnabler/adobeAuthorizationTemplate.xml'
+    ],
+    nonCheckedImports: [
+      'source/zapp.brs',
+      'source/MRuntime.brs',
+      'source/rLog/rLogMixin.brs',
+      'source/tests/rooibosDist.brs',
+      'source/rooibosFunctionMap.brs'
+    ],
+    createRuntimeFiles: false
   });
   let processor = new MaestroProjectProcessor(config);
   await processor.processFiles();
@@ -97,27 +133,28 @@ function copyToTests(cb) {
  * This target is used for CI
  */
 
- export async function prepareFrameworkTests(cb) {
+export async function prepareFrameworkTests(cb) {
   await rokuDeploy.prepublishToStaging(args);
-
+  console.log('running rooibos processor')
   let config = createProcessorConfig({
-    "projectPath": "out/.roku-deploy-staging",
+    "projectPath": "build",
     "testsFilePattern": [
       "**/tests/**/*.brs",
       "!**/rooibosDist.brs",
       "!**/rooibosFunctionMap.brs",
       "!**/TestsScene.brs"
-    ]
+    ],
+    showFailuresOnly: true,
   });
   let processor = new RooibosProcessor(config);
-  processor.processFiles();
-  
+  await processor.processFiles();
+
   cb();
 }
 
 export async function prepareCodeCoverageTests(cb) {
   await rokuDeploy.prepublishToStaging(args);
-  
+
   let config = createProcessorConfig({
     "projectPath": "out/.roku-deploy-staging",
     "testsFilePattern": [
@@ -159,7 +196,7 @@ export function doc(cb) {
 }
 
 export function updateVersion(cb) {
-  fs.writeFileSync("docs/version.txt", pkg.version); 
+  fs.writeFileSync("docs/version.txt", pkg.version);
   cb();
 }
 
@@ -171,8 +208,9 @@ function insertVersionNumber(cb) {
   cb();
 }
 
-exports.build = series(clean, createDirectories, compile, insertVersionNumber, squash, copyToSamples, copyToTests);
-exports.runFrameworkTests = series(exports.build, prepareFrameworkTests, zipFrameworkTests, deployFrameworkTests)
-exports.prePublishFrameworkTests = series(exports.build, prepareFrameworkTests)
-exports.prePublishFrameworkCodeCoverage = series(exports.build, prepareCodeCoverageTests)
+exports.build = series(clean, createDirectories, compileFramework, insertVersionNumber, squash, copyToSamples, copyToTests);
+exports.buildFrameworkTests = series(exports.build, clean, createDirectories, compile);
+exports.runFrameworkTests = series(exports.buildFrameworkTests, prepareFrameworkTests, zipFrameworkTests, deployFrameworkTests)
+exports.prePublishFrameworkTests = series(exports.buildFrameworkTests, prepareFrameworkTests)
+exports.prePublishFrameworkCodeCoverage = series(exports.buildFrameworkTests, prepareCodeCoverageTests)
 exports.dist = series(exports.build, doc, updateVersion);