Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Automatically use Protractor conf for mac if running grunt on mac #1332

Merged
merged 1 commit into from
Mar 9, 2017
Merged

Automatically use Protractor conf for mac if running grunt on mac #1332

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ var serveStatic = require('serve-static');

module.exports = function (grunt) {
var contextRoot = grunt.option('contextRoot') || "dev-console";
var isMac = /^darwin/.test(process.platform) || grunt.option('mac');

// Load grunt tasks automatically
require('load-grunt-tasks')(grunt, {
Expand Down Expand Up @@ -704,14 +705,14 @@ module.exports = function (grunt) {

grunt.registerTask('test-integration',
grunt.option('baseUrl') ?
[grunt.option('mac') ? 'protractor:mac' : 'protractor:default'] : // if a baseUrl is defined assume we dont want to run the local grunt server
[isMac ? 'protractor:mac' : 'protractor:default'] : // if a baseUrl is defined assume we dont want to run the local grunt server
[
'clean:server',
'concurrent:server',
'autoprefixer',
'connect:test',
'add-redirect-uri',
(grunt.option('mac') ? 'protractor:mac' : 'protractor:default'),
(isMac ? 'protractor:mac' : 'protractor:default'),
'clean:server'
]
);
Expand Down