Merge pull request #163 from Evilweed/disablescreenshotsoption

Disablescreenshotsoption
Evilweed · Aug 21, 2019 · ad915b2 · ad915b2
2 parents 3b5b447 + 9cdb945
commit ad915b2
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 322 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,7 @@
 # Changelog
 
+## Version 1.2.10
+* Added option for disabling all screenshots
 ## Version 1.2.9
 * Added favico (from angulars) to report page
 

diff --git a/README.md b/README.md
@@ -246,6 +246,18 @@ Default is `false`.
 
  Default is `false`.
 
+### Disable all screenshots
+If you want no screenshots at all, set the `disableScreenshots` option to true.  
+
+ ```javascript
+ new HtmlReporter({
+    baseDirectory: 'tmp/reports'    
+    , disableScreenshots: true
+ });
+ ``` 
+
+ Default is `false`.
+
 
 ### Add title for the html report (optional)
  Also you can define a document title for the html report generated using the `docTitle:` option:

diff --git a/app/reporter.js b/app/reporter.js
@@ -186,6 +186,7 @@ function ScreenshotReporter(options) {
         options.gatherBrowserLogs || true;
     this.takeScreenShotsOnlyForFailedSpecs =
         options.takeScreenShotsOnlyForFailedSpecs || false;
+    this.disableScreenshots = options.disableScreenshots || false;
     this.clientDefaults = options.clientDefaults || {};
     if (options.searchSettings) { //settings in earlier "format" there?
         this.clientDefaults.searchSettings = options.searchSettings;
@@ -199,6 +200,7 @@ function ScreenshotReporter(options) {
         excludeSkippedSpecs: this.excludeSkippedSpecs,
         takeScreenShotsOnlyForFailedSpecs: this.takeScreenShotsOnlyForFailedSpecs,
         takeScreenShotsForSkippedSpecs: this.takeScreenShotsForSkippedSpecs,
+        disableScreenshots: this.disableScreenshots,
         metaDataBuilder: this.metaDataBuilder,
         pathBuilder: this.pathBuilder,
         sortFunction: this.sortFunction,
@@ -339,7 +341,7 @@ class Jasmine2Reporter {
 
         metaData.browserLogs = [];
 
-        let considerScreenshot = !(this._screenshotReporter.takeScreenShotsOnlyForFailedSpecs && result.status === 'passed')
+        let considerScreenshot = !this._screenshotReporter.disableScreenshots && !(this._screenshotReporter.takeScreenShotsOnlyForFailedSpecs && result.status === 'passed')
 
         if (considerScreenshot) {
             metaData.screenShotFile = path.join(this._screenshotReporter.screenshotsSubfolder, screenShotFileName);

diff --git a/examples/protractor.jasmine2.conf.js b/examples/protractor.jasmine2.conf.js
@@ -24,6 +24,9 @@ exports.config = {
     // find its own unused port.
     seleniumPort: null,
 
+    /* direct connect on my local system*/
+    directConnect:!!process.env.CHROMIUM_BIN,
+
     // Chromedriver location is used to help the selenium standalone server
     // find chromedriver. This will be passed to the selenium jar as
     // the system property webdriver.chrome.driver. If null, selenium will
@@ -53,7 +56,15 @@ exports.config = {
     // https://code.google.com/p/selenium/wiki/DesiredCapabilities
     // and
     // https://code.google.com/p/selenium/source/browse/javascript/webdriver/capabilities.js
-    capabilities: {
+    capabilities:!!process.env.CHROMIUM_BIN?{
+        'browserName': 'chrome',
+        'applicationName': 'chromium',
+        'chromeOptions': {
+            'binary': process.env.CHROMIUM_BIN,
+            'args': ['--lang=en',
+                '--window-size=1680,1050']
+        }
+    }:{
         browserName: 'chrome',
         logName: 'Chrome - English',
         version: '',

diff --git a/index.js b/index.js
@@ -4863,6 +4863,7 @@ function ScreenshotReporter(options) {
     this.takeScreenShotsForSkippedSpecs = options.takeScreenShotsForSkippedSpecs || false;
     this.gatherBrowserLogs = options.gatherBrowserLogs || true;
     this.takeScreenShotsOnlyForFailedSpecs = options.takeScreenShotsOnlyForFailedSpecs || false;
+    this.disableScreenshots = options.disableScreenshots || false;
     this.clientDefaults = options.clientDefaults || {};
     if (options.searchSettings) {
         //settings in earlier "format" there?
@@ -4877,6 +4878,7 @@ function ScreenshotReporter(options) {
         excludeSkippedSpecs: this.excludeSkippedSpecs,
         takeScreenShotsOnlyForFailedSpecs: this.takeScreenShotsOnlyForFailedSpecs,
         takeScreenShotsForSkippedSpecs: this.takeScreenShotsForSkippedSpecs,
+        disableScreenshots: this.disableScreenshots,
         metaDataBuilder: this.metaDataBuilder,
         pathBuilder: this.pathBuilder,
         sortFunction: this.sortFunction,
@@ -5169,7 +5171,7 @@ var Jasmine2Reporter = function () {
 
                                 metaData.browserLogs = [];
 
-                                considerScreenshot = !(this._screenshotReporter.takeScreenShotsOnlyForFailedSpecs && result.status === 'passed');
+                                considerScreenshot = !this._screenshotReporter.disableScreenshots && !(this._screenshotReporter.takeScreenShotsOnlyForFailedSpecs && result.status === 'passed');
 
 
                                 if (considerScreenshot) {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "protractor-beautiful-reporter",
-  "version": "1.2.9",
+  "version": "1.2.10",
   "description": "An npm module and which generates your Protractor test reports in HTML (angular) with screenshots",
   "main": "index.js",
   "repository": {