Skip to content

Fix bug preventing logLevel from being set to DISABLE #169

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

Merged
merged 1 commit into from
Dec 7, 2018
Merged

Fix bug preventing logLevel from being set to DISABLE #169

Show file tree
Hide file tree
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: 4 additions & 1 deletion amplitude.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2062,7 +2062,9 @@ var logLevels = {
var logLevel = logLevels.WARN;

var setLogLevel = function setLogLevel(logLevelName) {
logLevel = logLevels[logLevelName] || logLevel;
if (logLevels.hasOwnProperty(logLevelName)) {
logLevel = logLevels[logLevelName];
}
};

var getLogLevel = function getLogLevel() {
Expand Down Expand Up @@ -2284,6 +2286,7 @@ var getQueryParam = function getQueryParam(name, query) {
var utils = {
setLogLevel: setLogLevel,
getLogLevel: getLogLevel,
logLevels: logLevels,
log: log,
isEmptyString: isEmptyString,
getQueryParam: getQueryParam,
Expand Down
2 changes: 1 addition & 1 deletion amplitude.min.js
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion src/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ var logLevels = {
let logLevel = logLevels.WARN;

const setLogLevel = function setLogLevel(logLevelName) {
logLevel = logLevels[logLevelName] || logLevel;
if (logLevels.hasOwnProperty(logLevelName)) {
logLevel = logLevels[logLevelName];
}
};

const getLogLevel = function getLogLevel() {
Expand Down Expand Up @@ -236,6 +238,7 @@ var getQueryParam = function getQueryParam(name, query) {
export default {
setLogLevel,
getLogLevel,
logLevels,
log,
isEmptyString,
getQueryParam,
Expand Down
27 changes: 27 additions & 0 deletions test/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,33 @@ describe('utils', function() {
});
});

describe('setLogLevel', function() {
afterEach(() => {
utils.setLogLevel('WARN');
});

it('can set log level to DISABLE', function() {
utils.setLogLevel('DISABLE');
assert.strictEqual(utils.getLogLevel(), utils.logLevels.DISABLE);
});

it('can set log level to ERROR', () => {
utils.setLogLevel('ERROR');
assert.strictEqual(utils.getLogLevel(), utils.logLevels.ERROR);
});

it('can set log level to WARN', () => {
utils.setLogLevel('DISABLE');
utils.setLogLevel('WARN');
assert.strictEqual(utils.getLogLevel(), utils.logLevels.WARN);
});

it('can set log level to INFO', () => {
utils.setLogLevel('INFO');
assert.strictEqual(utils.getLogLevel(), utils.logLevels.INFO);
});
});

describe('log', function() {
beforeEach(function() {
utils.setLogLevel('INFO');
Expand Down