Constrain space-enabled features to those of the instance

Author: fbacall

app/helpers/spaces_helper.rb

@@ -5,6 +5,10 @@ def spaces_info
   end
 
   def space_feature_options
-    Space::FEATURES.map { |f| [t("features.#{f}.short"), f] }
+    Space::FEATURES.select do |f|
+      TeSS::Config.feature[f]
+    end.map do |f|
+      [t("features.#{f}.short"), f]
+    end
   end
 end

app/models/space.rb

@@ -51,7 +51,7 @@ def users_with_role(role)
 
   def feature_enabled?(feature)
     if FEATURES.include?(feature)
-      !disabled_features.include?(feature)
+      TeSS::Config.feature[feature] && !disabled_features.include?(feature)
     else
       TeSS::Config.feature[feature]
     end

test/controllers/spaces_controller_test.rb

@@ -238,4 +238,28 @@ class SpacesControllerTest < ActionController::TestCase
     assert_includes admins, existing_admin
     assert_includes admins, new_admin
   end
+
+  test 'only instance-enabled features are listed on management page' do
+    sign_in @space.user
+    features = { 'events': true,
+                 'materials': false,
+                 'elearning_materials': false,
+                 'learning_paths': false,
+                 'workflows': true,
+                 'collections': false,
+                 'content_providers': false,
+                 'trainers': false,
+                 'nodes': false
+    }
+
+    with_settings(feature: features) do
+      get :edit, params: { id: @space }
+      assert_response :success
+      assert_select '[name="space[enabled_features][]"]', count: 3 # +1 because of the blank input that allows you to
+                                                                   #  clear the list
+      assert_select '#space_enabled_features_events', count: 1
+      assert_select '#space_enabled_features_workflows', count: 1
+      assert_select '#space_enabled_features_materials', count: 0
+    end
+  end
 end

test/controllers/static_controller_test.rb

@@ -694,4 +694,22 @@ class StaticControllerTest < ActionController::TestCase
       end
     end
   end
+
+  test 'space enabled features are limited by instance enabled features' do
+    space = spaces(:plants)
+    space.disabled_features = []
+    space.save!
+
+    assert_includes space.enabled_features, 'events'
+
+    with_settings(feature: { 'events': false }) do
+      with_host('plants.mytess.training') do
+        get :home
+        assert_select 'ul.nav.navbar-nav' do
+          assert_select 'li a[href=?]', materials_path, count: 1
+          assert_select 'li a[href=?]', events_path, count: 0
+        end
+      end
+    end
+  end
 end

test/models/space_test.rb

@@ -85,6 +85,20 @@ class SpaceTest < ActiveSupport::TestCase
     end
   end
 
+  test 'feature_enabled? is limited by instance enabled features' do
+    @space.disabled_features = []
+    assert_includes @space.enabled_features, 'events'
+    with_settings(feature: { 'events' => true }) do
+      assert @space.feature_enabled?('events')
+      assert @space.feature_enabled?('materials')
+    end
+
+    with_settings(feature: { 'events' => false }) do
+      refute @space.feature_enabled?('events')
+      assert @space.feature_enabled?('materials')
+    end
+  end
+
   test 'enabled_features returns all features except disabled ones' do
     @space.disabled_features = ['events', 'materials']
     enabled = @space.enabled_features