Test fixes

ElixirTeSS · Feb 2, 2024 · f1bcf97 · f1bcf97
1 parent c8e4fe2
commit f1bcf97
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 13 deletions.
diff --git a/app/policies/learning_path_topic_policy.rb b/app/policies/learning_path_topic_policy.rb
@@ -4,4 +4,12 @@ def update?
     super || @record.collaborator?(@user)
   end
 
+  def manage?
+    curators_and_admin
+  end
+
+  def create?
+    curators_and_admin
+  end
+
 end
diff --git a/test/fixtures/learning_path_topics.yml b/test/fixtures/learning_path_topics.yml
@@ -3,11 +3,11 @@
 good_and_bad:
   title: My Learning Path Topic
   description: MyText
-  user: regular_user
+  user: admin
   keywords: ["Learning", "Discovery"]
 
 goblet_things:
   title: Another Learning Path Topic
   description: Some text
-  user: regular_user
+  user: admin
   keywords: ["Interesting"]
diff --git a/test/fixtures/learning_paths.yml b/test/fixtures/learning_paths.yml
@@ -34,5 +34,5 @@ archived_learning_path:
   title: This Learning Path Is Hidden
   description: MyText
   public: false
-  user: admin
+  user: curator
   status: development
diff --git a/test/models/learning_path_test.rb b/test/models/learning_path_test.rb
@@ -2,15 +2,20 @@
 
 class LearningPathTest < ActiveSupport::TestCase
   test 'visibility scope' do
-    assert_not_includes LearningPath.visible_by(nil), learning_paths(:archived_learning_path)
-    assert_not_includes LearningPath.visible_by(users(:another_regular_user)), learning_paths(:archived_learning_path)
-    assert_includes LearningPath.visible_by(users(:regular_user)), learning_paths(:archived_learning_path)
-    assert_includes LearningPath.visible_by(users(:admin)), learning_paths(:archived_learning_path)
+    archived = learning_paths(:archived_learning_path)
+    archived.collaborators << users(:another_regular_user)
+    assert_not_includes LearningPath.visible_by(nil), archived
+    assert_not_includes LearningPath.visible_by(users(:regular_user)), archived
+    assert_includes LearningPath.visible_by(users(:admin)), archived
+    assert_includes LearningPath.visible_by(users(:curator)), archived
+    assert_includes LearningPath.visible_by(users(:another_regular_user)), archived
 
-    assert_includes LearningPath.visible_by(nil), learning_paths(:one)
-    assert_includes LearningPath.visible_by(users(:another_regular_user)), learning_paths(:one)
-    assert_includes LearningPath.visible_by(users(:regular_user)), learning_paths(:one)
-    assert_includes LearningPath.visible_by(users(:admin)), learning_paths(:one)
+    visible = learning_paths(:one)
+    assert_includes LearningPath.visible_by(nil), visible
+    assert_includes LearningPath.visible_by(users(:regular_user)), visible
+    assert_includes LearningPath.visible_by(users(:admin)), visible
+    assert_includes LearningPath.visible_by(users(:curator)), visible
+    assert_includes LearningPath.visible_by(users(:another_regular_user)), visible
   end
 
   test 'add topic to learning path' do

diff --git a/test/models/user_test.rb b/test/models/user_test.rb
@@ -282,8 +282,6 @@ class UserTest < ActiveSupport::TestCase
     assert_equal user, source.user
     assert_equal user, collection.user
     assert_equal user, node.user
-    assert_equal user, learning_path.user
-    assert_equal user, learning_path_topic.user
 
     user.destroy!
 
@@ -295,6 +293,11 @@ class UserTest < ActiveSupport::TestCase
     assert_equal default_user, source.reload.user
     assert_equal default_user, collection.reload.user
     assert_equal default_user, node.reload.user
+
+    admin = users(:admin)
+    assert_equal admin, learning_path.user
+    assert_equal admin, learning_path_topic.user
+    admin.destroy!
     assert_equal default_user, learning_path.reload.user
     assert_equal default_user, learning_path_topic.reload.user
   end