Merge branch 'master' into dev

This commit is contained in:
Nick O'Leary
2021-01-07 10:17:50 +00:00
17 changed files with 167 additions and 27 deletions

View File

@@ -142,4 +142,19 @@ describe("api/editor/theme", function () {
settings.projects.should.have.a.property("enabled", false);
});
it("test explicit userMenu set to true in theme setting", function () {
theme.init({
editorTheme: {
userMenu: true,
}
});
theme.app();
var settings = theme.settings();
settings.should.have.a.property("userMenu");
settings.userMenu.should.be.eql(true);
});
});