diff --git a/src/index.js b/src/index.js index 5a3fdf5..68ed3ff 100644 --- a/src/index.js +++ b/src/index.js @@ -80,8 +80,7 @@ function openRegisterDialog() { insights: true, insights_available: subscriptionsClient.insightsAvailable, insights_detected: false, - register_method: 'account', - enable_content: true + register_method: 'account' }); Insights.detect().then(installed => { diff --git a/src/subscriptions-client.js b/src/subscriptions-client.js index 20a66b5..9c9222c 100644 --- a/src/subscriptions-client.js +++ b/src/subscriptions-client.js @@ -354,7 +354,7 @@ client.registerSystem = (subscriptionDetails, update_progress) => new Promise((r else { console.debug('registering using username and password'); const registration_options = { - "enable_content": dbus_bool(subscriptionDetails.enable_content) + "enable_content": dbus_bool(true) }; console.log('registration_options:', registration_options); if (update_progress) diff --git a/src/subscriptions-register.jsx b/src/subscriptions-register.jsx index 1a4eda6..5948718 100644 --- a/src/subscriptions-register.jsx +++ b/src/subscriptions-register.jsx @@ -75,13 +75,12 @@ class SubscriptionRegisterDialog extends React.Component { ); } let insights; - let insights_checkbox_disabled = true; - if (this.props.insights_available === true) { - insights_checkbox_disabled = false; - } else { - if (this.props.enable_content === true) { - insights_checkbox_disabled = false; - } + let insights_checkbox_disabled = false; + // Disable registration of insights-client only in the corner case, when + // insights-client is not installed, and it is not possible to install it, + // because PackageKit is not available + if (this.props.insights_available === false) { + insights_checkbox_disabled = true; } insights = [ @@ -176,15 +175,6 @@ class SubscriptionRegisterDialog extends React.Component { { credentials } - - { - this.props.onChange('enable_content', value); - this.props.insights && !value && this.props.onChange('insights', value); - }} - /> - { insights } ); diff --git a/test/check-subscriptions b/test/check-subscriptions index ceeee70..69c1ac4 100755 --- a/test/check-subscriptions +++ b/test/check-subscriptions @@ -320,38 +320,6 @@ class TestSubscriptions(SubscriptionsCase): # find another one that isn't subscribed too self.wait_subscription(PRODUCT_SHARED, False) - def testRegisterDoNotEnableContent(self): - """ - Test registration without enabled content. Only consumer certificate - should be installed. No entitlement certificate is installed in this - case. - """ - b = self.browser - - self.login_and_go("/subscriptions") - - # wait until we can open the registration dialog - register_button_sel = "button:contains('Register')" - b.click(register_button_sel) - - b.wait_visible("#subscription-register-url") - - # enter server and correct login data - b.set_val("#subscription-register-url", "custom") - b.set_input_text("#subscription-register-url-custom", CANDLEPIN_URL) - b.set_input_text("#subscription-register-username", "admin") - b.set_input_text("#subscription-register-password", "admin") - b.set_input_text("#subscription-register-org", "donaldduck") - - b.click("#subscription-enable-content") - - dialog_register_button_sel = "footer .pf-m-primary" - b.click(dialog_register_button_sel) - - # dialog should disappear - with b.wait_timeout(60): - b.wait_not_present(dialog_register_button_sel) - def testUnpriv(self): self.machine.execute("useradd junior; echo junior:foobar | chpasswd") self.login_and_go("/subscriptions", user="junior")