Removing the experimental Jasmine support. With Jasmine, the reporter…

…s (such as Serenity) are forced to be synchronous and there seems to be no easy way around it until angular/protractor#1938 gets fixed.
serenity-js · Aug 16, 2016 · b3c002b · b3c002b
1 parent 5163580
commit b3c002b
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 246 deletions.
diff --git a/examples/todomvc-protractor-jasmine/.gitignore b/examples/todomvc-protractor-jasmine/.gitignore
diff --git a/examples/todomvc-protractor-jasmine/package.json b/examples/todomvc-protractor-jasmine/package.json
diff --git a/examples/todomvc-protractor-jasmine/protractor.conf.js b/examples/todomvc-protractor-jasmine/protractor.conf.js
diff --git a/examples/todomvc-protractor-jasmine/spec/record_todos.ts b/examples/todomvc-protractor-jasmine/spec/record_todos.ts
diff --git a/examples/todomvc-protractor-jasmine/src/expect.ts b/examples/todomvc-protractor-jasmine/src/expect.ts
diff --git a/examples/todomvc-protractor-jasmine/src/text.ts b/examples/todomvc-protractor-jasmine/src/text.ts
diff --git a/examples/todomvc-protractor-jasmine/tsconfig.json b/examples/todomvc-protractor-jasmine/tsconfig.json
diff --git a/examples/todomvc-protractor-jasmine/typings.json b/examples/todomvc-protractor-jasmine/typings.json
diff --git a/src/serenity-jasmine/index.ts b/src/serenity-jasmine/index.ts
diff --git a/src/serenity-jasmine/jasmine_serenity_notifier.ts b/src/serenity-jasmine/jasmine_serenity_notifier.ts
diff --git a/src/serenity-protractor/adapter/serenity_protractor_plugin.ts b/src/serenity-protractor/adapter/serenity_protractor_plugin.ts
@@ -1,5 +1,6 @@
+import { Deferred } from '../../serenity/recording/async';
 import { FileSystemOutlet } from '../../serenity/reporting/outlet';
-import { RehearsalReport, Scribe } from '../../serenity/reporting/scribe';
+import { EventLog, RehearsalReport, Scribe } from '../../serenity/reporting/scribe';
 import { Serenity } from '../../serenity/serenity';
 import { ProtractorPlugin } from 'protractor/built/plugins';
 import { Md5 } from 'ts-md5/dist/md5';
@@ -12,32 +13,50 @@ export interface TestInfo {
 export class SerenityProtractorPlugin extends ProtractorPlugin {
 
     private reporter    = new RehearsalReport();
-    // private debug       = new EventLog();
+    private debug       = new EventLog();
+
+    private printEvents = true;
 
     private scribe;
     private id = 'serenity-protractor-plugin';
 
+    private allDone = new Deferred();
+
     setup() {
         // todo: the path should be configurable
         this.scribe = new Scribe(new FileSystemOutlet(`${process.cwd()}/target/site/serenity`));
     };
 
     postTest(passed: boolean, info: TestInfo): Promise<any> {
-        // todo: the reporters should be configurable
         return Promise.all([
             this.reporter.of(Serenity.readNewJournalEntriesAs(this.id)).then( (reports) => {
                 this.scribe.write(reports.pop(), `${this.hash(info.category, info.name)}.json`);
             }),
-            // this.debug.of(Serenity.readNewJournalEntriesAs('debug')).then( entries => {
-            //     entries.forEach(entry => console.log(entry));
-            // }),
-        ]);
+            this.printEvents ? this.printAll() : Promise.resolve(),
+        ])
+        .then(() => {
+            console.log('finished writing the reports');  // tslint:disable-line:no-console
+
+            this.allDone.resolve();
+        });
     }
 
     postResults(): Promise<void> {
         return Promise.resolve();
     }
 
+    teardown(): Promise<any> {
+        // https://github.com/angular/protractor/issues/1938
+
+        return this.allDone.promise;
+    }
+
+    private printAll(): Promise<void> {
+        return this.debug.of(Serenity.readNewJournalEntriesAs('debug')).then( entries => {
+            entries.forEach(entry => console.log(entry));   // tslint:disable-line:no-console
+        });
+    }
+
     private hash(...values: string[]): string {
         return <string> Md5.hashAsciiStr(values.join(':'));
     }