Merge branch 'master' of https://github.com/Alfresco/alfresco-content-app into pionnegru-tidyup

# Conflicts:
#	src/app/components/libraries/libraries.component.html
#	src/app/components/recent-files/recent-files.component.html

.gitignore

@@ -36,6 +36,7 @@ testem.log
 # e2e
 /e2e/*.js
 /e2e/*.map
+/e2e-output
 
 # System Files
 .DS_Store

package.json

@@ -49,7 +49,9 @@
     "@types/node": "~6.0.60",
     "codelyzer": "~3.2.0",
     "jasmine-core": "~2.6.2",
+    "jasmine-reporters": "2.2.1",
     "jasmine-spec-reporter": "~4.1.0",
+    "jasmine2-protractor-utils": "1.3.0",
     "karma": "~1.7.0",
     "karma-chrome-launcher": "~2.1.1",
     "karma-cli": "~1.0.1",

protractor.conf.js

@@ -1,7 +1,11 @@
 // Protractor configuration file, see link for more information
 // https://github.com/angular/protractor/blob/master/lib/config.ts
 
+const path = require('path');
 const { SpecReporter } = require('jasmine-spec-reporter');
+const jasmineReporters = require('jasmine-reporters');
+
+const projectRoot = path.resolve(__dirname);
 
 exports.config = {
   allScriptsTimeout: 11000,
@@ -9,7 +13,12 @@ exports.config = {
     './e2e/**/*.test.ts'
   ],
   capabilities: {
-    'browserName': 'chrome'
+    'browserName': 'chrome',
+    chromeOptions: {
+        prefs: {
+            'credentials_enable_service': false
+        }
+    }
   },
   directConnect: true,
   baseUrl: 'http://localhost:3000',
@@ -19,10 +28,29 @@ exports.config = {
     defaultTimeoutInterval: 30000,
     print: function() {}
   },
+  plugins: [{
+      package: 'jasmine2-protractor-utils',
+      disableHTMLReport: false,
+      disableScreenshot: false,
+      screenshotOnExpectFailure: true,
+      screenshotOnSpecFailure: false,
+      clearFoldersBeforeTest: true,
+      htmlReportDir: `${projectRoot}/e2e-output/html-report/`,
+      screenshotPath: `${projectRoot}/e2e-output/screenshots/`
+  }],
   onPrepare() {
     require('ts-node').register({
       project: 'e2e/tsconfig.e2e.json'
     });
     jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
+
+    jasmine.getEnv().addReporter(new jasmineReporters.JUnitXmlReporter({
+        consolidateAll: true,
+        savePath: `${projectRoot}/e2e-output/junit-report`,
+        filePrefix: 'results.xml',
+        useDotNotation: false,
+        useFullTestName: false,
+        reportFailedUrl: true
+    }));
   }
 };

src/app/components/libraries/libraries.component.html

@@ -23,8 +23,8 @@
                 <ng-template>
                     <div class="empty-list__block">
                         <mat-icon>group_work</mat-icon>
-                        <p class="empty-list__title">{{ 'APP.BROWSE.LIBRARIES.EMPTY_STATE.TITLE' | translate }}</p>
+                        <p class="app-no-content_title">{{ 'APP.BROWSE.LIBRARIES.EMPTY_STATE.TITLE' | translate }}</p>
-                        <p class="empty-list__text">{{ 'APP.BROWSE.LIBRARIES.EMPTY_STATE.TITLE' | translate }}</p>
+                        <p class="app-no-content_text">{{ 'APP.BROWSE.LIBRARIES.EMPTY_STATE.TEXT' | translate }}</p>
                     </div>
                 </ng-template>
             </empty-folder-content>

src/app/components/recent-files/recent-files.component.html

@@ -84,8 +84,8 @@
                 <ng-template>
                     <div class="empty-list__block">
                         <mat-icon>access_time</mat-icon>
-                        <p class="empty-list__title">{{ 'APP.BROWSE.RECENT.EMPTY_STATE.TITLE' | translate }}</p>
+                        <p class="app-no-content_title">{{ 'APP.BROWSE.RECENT.EMPTY_STATE.TITLE' | translate }}</p>
-                        <p class="empty-list__text">{{ 'APP.BROWSE.RECENT.EMPTY_STATE.TITLE' | translate }}</p>
+                        <p class="app-no-content_text">{{ 'APP.BROWSE.RECENT.EMPTY_STATE.TEXT' | translate }}</p>
                     </div>
                 </ng-template>
             </empty-folder-content>

src/app/components/shared-files/shared-files.component.html

@@ -83,7 +83,7 @@
                     <div class="empty-list__block">
                         <mat-icon>people</mat-icon>
                         <p class="empty-list__title">{{ 'APP.BROWSE.SHARED.EMPTY_STATE.TITLE' | translate }}</p>
-                        <p class="empty-list__text">{{ 'APP.BROWSE.SHARED.EMPTY_STATE.TITLE' | translate }}</p>
+                        <p class="empty-list__text">{{ 'APP.BROWSE.SHARED.EMPTY_STATE.TEXT' | translate }}</p>
                     </div>
                 </ng-template>
             </empty-folder-content>