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

Jump to bottom

Improve: Expose apps enable setting at General > Apps #12196

Merged
merged 2 commits into from
Sep 28, 2018
Merged

Improve: Expose apps enable setting at General > Apps #12196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b07ed7a
Improve: Expose apps enable setting at `General > Apps`
rodrigok Sep 27, 2018
c8b24b3
Fix tests
sampaiodiego Sep 28, 2018
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
10 changes: 7 additions & 3 deletions packages/rocketchat-apps/server/orchestrator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,13 @@ class AppServerOrchestrator {
}
}

RocketChat.settings.add('Apps_Framework_enabled', true, {
type: 'boolean',
hidden: true,
RocketChat.settings.addGroup('General', function() {
this.section('Apps', function() {
this.add('Apps_Framework_enabled', true, {
type: 'boolean',
hidden: false,
});
});
});

RocketChat.settings.get('Apps_Framework_enabled', (key, isEnabled) => {
Expand Down
14 changes: 7 additions & 7 deletions tests/pageobjects/administration.page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,13 @@ class Administration extends Page {
// settings
get buttonSave() { return browser.element('button.save'); }

get generalButtonExpandIframe() { return browser.element('.section:nth-of-type(3) .button.expand'); }
get generalButtonExpandNotifications() { return browser.element('.section:nth-of-type(4) .button.expand'); }
get generalButtonExpandRest() { return browser.element('.section:nth-of-type(5) .button.expand'); }
get generalButtonExpandReporting() { return browser.element('.section:nth-of-type(6) .button.expand'); }
get generalButtonExpandStreamCast() { return browser.element('.section:nth-of-type(7) .button.expand'); }
get generalButtonExpandTranslations() { return browser.element('.section:nth-of-type(8) .button.expand'); }
get generalButtonExpandUTF8() { return browser.element('.section:nth-of-type(9) .button.expand'); }
get generalButtonExpandIframe() { return browser.element('.section:nth-of-type(4) .button.expand'); }
get generalButtonExpandNotifications() { return browser.element('.section:nth-of-type(5) .button.expand'); }
get generalButtonExpandRest() { return browser.element('.section:nth-of-type(6) .button.expand'); }
get generalButtonExpandReporting() { return browser.element('.section:nth-of-type(7) .button.expand'); }
get generalButtonExpandStreamCast() { return browser.element('.section:nth-of-type(8) .button.expand'); }
get generalButtonExpandTranslations() { return browser.element('.section:nth-of-type(9) .button.expand'); }
get generalButtonExpandUTF8() { return browser.element('.section:nth-of-type(10) .button.expand'); }

get generalSiteUrl() { return browser.element('[name="Site_Url"]'); }
get generalSiteUrlReset() { return browser.element('.reset-setting[data-setting="Site_Url"]'); }
Expand Down