From 584835e68239ce55d1fc007b284e8ef4ed2817c2 Mon Sep 17 00:00:00 2001 From: Michał Gołębiowski-Owczarek Date: Mon, 21 Oct 2019 19:06:39 +0200 Subject: Build: Run tests on Travis on FirefoxHeadless as well Also, run them on both ChromeHeadless & FirefoxHeadless locally on `grunt karma:main`. Plus, so far, the chrome addons were installed for all the jobs, even the ones that weren't used for browser testing. Changing that makes those jobs faster. Closes gh-4524 --- .travis.yml | 11 +++++++---- Gruntfile.js | 7 ++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 10cef4a65..97d54454f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,14 +4,17 @@ node_js: - "8" - "10" - "12" -addons: - chrome: stable env: - NPM_SCRIPT=test:browserless matrix: include: # Run browser tests only on one Node.js version to save time. - - node_js: "10" - env: NPM_SCRIPT=test:browser + - node_js: "12" + env: + - NPM_SCRIPT="test:browser" + - BROWSERS="ChromeHeadless,FirefoxHeadless" + addons: + chrome: stable + firefox: latest script: - npm run $NPM_SCRIPT diff --git a/Gruntfile.js b/Gruntfile.js index e740690af..7f21bf613 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -13,8 +13,7 @@ module.exports = function( grunt ) { } var fs = require( "fs" ), - gzip = require( "gzip-js" ), - isTravis = process.env.TRAVIS; + gzip = require( "gzip-js" ); if ( !grunt.option( "filename" ) ) { grunt.option( "filename", "jquery.js" ); @@ -191,9 +190,7 @@ module.exports = function( grunt ) { singleRun: true }, main: { - - // The Chrome sandbox doesn't work on Travis. - browsers: [ isTravis ? "ChromeHeadlessNoSandbox" : "ChromeHeadless" ] + browsers: [ "ChromeHeadless", "FirefoxHeadless" ] }, jsdom: { -- cgit v1.2.3 able Mirror of redmine code source: https://github.com/redmine/redminewww-data
summaryrefslogtreecommitdiffstats
path: root/app/views/mailer/account_information.html.erb
blob: d010431ab9f58b4099516ce64d01ca75561799f0 (plain) 
1
2
3
4
5
6
7
8
9
10
11
12
13

<% if @user.auth_source %>
<p><%= l(:mail_body_account_information_external, h(@user.auth_source.name)) %></p>
<% else %>
<p><%= l(:mail_body_account_information) %>:</p>
<ul>
    <li><%= l(:field_login) %>: <%= @user.login %></li>
    <% if @password %>
    <li><%= l(:field_password) %>: <%= @password %></li>
    <% end %>
</ul>
<% end %>

<p><%= l(:label_login) %>: <%= link_to @login_url, @login_url %></p>