Skip to content
This repository was archived by the owner on Sep 5, 2024. It is now read-only.

fix(nav-bar): set ng-href on nav-item even if md-nav-href is empty #11488

Merged
merged 1 commit into from
Oct 24, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion config/karma-sauce.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ module.exports = function(config) {
}
},

singleRun: true
singleRun: true,
autoWatch: false
});

};
2 changes: 2 additions & 0 deletions config/karma-travis.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ module.exports = function(config) {
// Override defaults with custom CI settings
config.set({
colors: false,
singleRun: true,
autoWatch: false,

browsers: ['ChromeHeadlessNoSandbox', 'FirefoxHeadless'],
customLaunchers: {
Expand Down
23 changes: 18 additions & 5 deletions config/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,17 @@ module.exports = function(config) {
plugins: [
require("karma-jasmine"),
require("karma-chrome-launcher"),
require('karma-firefox-launcher')
require('karma-firefox-launcher'),
require('karma-browserstack-launcher'),
require('karma-sauce-launcher')
],
frameworks: ['jasmine'],
files: dependencies.concat(testSrc),

browserDisconnectTimeout: 500,
browserDisconnectTimeout: 10000,
browserDisconnectTolerance: 3,
browserNoActivityTimeout: 10000,
captureTimeout: 10000,

logLevel: config.LOG_DEBUG,
port: 9876,
Expand All @@ -63,8 +68,16 @@ module.exports = function(config) {

// Continuous Integration mode
// enable / disable watching file and executing tests whenever any file changes
singleRun: true,
autoWatch: false,
singleRun: false,
autoWatch: true,

// Try Websocket for a faster transmission first. Fallback to polling if necessary.
transports: ['websocket', 'polling'],

browserConsoleLogOptions: {
terminal: true,
level: 'log'
},

// Start these browsers, currently available:
// - Chrome
Expand All @@ -78,7 +91,7 @@ module.exports = function(config) {

client: {
// Do not clear the context as this can cause reload failures with Jasmine
clearContext:false
clearContext: false
}
});
};
77 changes: 40 additions & 37 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
"gulp-sass": "^4.0.1",
"gulp-uglify": "^3.0.0",
"gulp-util": "^3.0.8",
"jasmine-core": "^2.2.0",
"jasmine-core": "2.8.0",
"jquery": "^3.3.1",
"jshint": "^2.9.5",
"jshint-summary": "^0.4.0",
Expand Down
Loading