Merge branch 'develop' into feature-enable-form-edit-mode

ui/core/app/controllers/application.js

@@ -1,8 +1,13 @@
 import Controller from '@ember/controller';
 import { inject as service } from '@ember/service';
+import config from '../config/environment';
 
 export default class ApplicationController extends Controller {
   // =services
 
   @service session;
+
+  // =attributes
+
+  notifyTimeout = config.notifyTimeout;
 }

ui/core/app/templates/application.hbs

@@ -33,7 +33,7 @@
 
 </Rose::Layout::Global>
 
-<EmberNotify @closeAfter={{4000}} as |message close|>
+<EmberNotify @closeAfter={{this.notifyTimeout}} as |message close|>
   <Rose::Notification
     @style={{message.type}}
     @heading={{t (concat 'states.' message.type)}}

ui/core/config/environment.js

@@ -33,6 +33,8 @@ module.exports = function (environment) {
 
     appName: APP_NAME,
 
+    notifyTimeout: 4000,
+
     contentSecurityPolicyHeader: 'Content-Security-Policy',
     contentSecurityPolicyMeta: true,
     contentSecurityPolicy: {
@@ -93,6 +95,9 @@ module.exports = function (environment) {
 
     // CSP breaks test coverage, so it is disabled in this environment
     ENV.contentSecurityPolicyMeta = false;
+
+    // Notification timeout should be 0 for fast tests
+    ENV.notifyTimeout = 0;
   }
 
   if (environment === 'production') {