Merge pull request #1114 from ElixirTeSS/learning-path-curator-role-fix

Learning path curator role fix

Author: fbacall

.github/workflows/docker-test.yml

@@ -14,6 +14,6 @@ jobs:
           cp config/tess.example.yml config/tess.yml
           cp config/secrets.example.yml config/secrets.yml
       - name: Build
-        run: docker compose build test
+        run: docker compose --profile test build test
       - name: Test
-        run: docker compose run test
+        run: docker compose --profile test run test

Gemfile

@@ -62,7 +62,7 @@ gem 'simple_token_authentication'
 gem 'sitemap_generator'
 gem 'sitemap-parser'
 gem 'slim'
-gem 'sunspot_rails', github: 'sunspot/sunspot', branch: 'master' # Contains Ruby 3 fixes that are not released
+gem 'sunspot_rails'
 gem 'terser'
 gem 'tess_rdf_extractors', git: 'https://github.com/ElixirTeSS/TeSS_RDF_Extractors', branch: 'master'
 gem 'turbolinks'

Gemfile.lock

@@ -6,18 +6,6 @@ GIT
     tess_rdf_extractors (1.1.0)
       linkeddata (~> 3.2.0)
 
-GIT
-  remote: https://github.com/sunspot/sunspot.git
-  revision: 678c5b2b57d3b06b9432307f00283ecc6c85ad4d
-  branch: master
-  specs:
-    sunspot (2.6.0)
-      pr_geohash (~> 1.0)
-      rsolr (>= 1.1.1, < 3)
-    sunspot_rails (2.6.0)
-      rails (>= 5)
-      sunspot (= 2.6.0)
-
 GEM
   remote: https://rails-assets.org/
   specs:
@@ -138,12 +126,12 @@ GEM
     base64 (0.1.2)
     bcp47_spec (0.2.1)
     bcrypt (3.1.20)
-    benchmark (0.4.0)
+    benchmark (0.4.1)
     better_errors (2.10.1)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
       rouge (>= 1.0.0)
-    bigdecimal (3.1.9)
+    bigdecimal (3.2.2)
     bindata (2.5.0)
     bindex (0.8.1)
     binding_of_caller (1.0.0)
@@ -170,8 +158,8 @@ GEM
       json_schema (~> 0.14, >= 0.14.3)
       openapi_parser (~> 1.0)
       rack (>= 1.5)
-    concurrent-ruby (1.3.4)
-    connection_pool (2.5.0)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.3)
     countries (5.6.0)
       unaccent (~> 0.3)
     country_select (8.0.2)
@@ -195,28 +183,31 @@ GEM
     docile (1.4.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    drb (2.2.1)
+    drb (2.2.3)
     ebnf (2.4.0)
       htmlentities (~> 4.3)
       rdf (~> 3.3)
       scanf (~> 1.0)
       sxp (~> 1.3)
       unicode-types (~> 1.8)
+    erb (5.0.1)
     erubi (1.13.1)
     ethon (0.16.0)
       ffi (>= 1.15.0)
     event_stream_parser (1.0.0)
     eventbrite_sdk (3.6.0)
       rest-client (~> 2.0)
     execjs (2.8.1)
-    faraday (2.9.0)
-      faraday-net_http (>= 2.0, < 3.2)
+    faraday (2.13.1)
+      faraday-net_http (>= 2.0, < 3.5)
+      json
+      logger
     faraday-follow_redirects (0.3.0)
       faraday (>= 1, < 3)
     faraday-multipart (1.1.0)
       multipart-post (~> 2.0)
-    faraday-net_http (3.1.0)
-      net-http
+    faraday-net_http (3.4.0)
+      net-http (>= 0.5.0)
     ffi (1.15.5)
     font-awesome-sass (4.7.0)
       sass (>= 3.2)
@@ -245,15 +236,16 @@ GEM
     httparty (0.21.0)
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    i18n (1.14.6)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
     i18n_data (0.17.1)
       simple_po_parser (~> 1.1)
     icalendar (2.9.0)
       ice_cube (~> 0.16)
     ice_cube (0.16.4)
     io-console (0.8.0)
-    irb (1.14.3)
+    irb (1.15.2)
+      pp (>= 0.6.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     iso_country_codes (0.7.8)
@@ -270,7 +262,7 @@ GEM
     jquery-turbolinks (2.1.0)
       railties (>= 3.1.0)
       turbolinks
-    json (2.6.3)
+    json (2.12.2)
     json-canonicalization (1.0.0)
     json-jwt (1.16.6)
       activesupport (>= 4.2)
@@ -349,8 +341,8 @@ GEM
     listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    logger (1.6.5)
-    loofah (2.24.0)
+    logger (1.7.0)
+    loofah (2.24.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -366,8 +358,8 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2023.0808)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.8)
-    minitest (5.25.4)
+    mini_portile2 (2.8.9)
+    minitest (5.25.5)
     minitest-reporters (1.6.1)
       ansi
       builder
@@ -387,18 +379,18 @@ GEM
     multi_xml (0.6.0)
     multipart-post (2.4.1)
     nested_form (0.3.2)
-    net-http (0.4.1)
+    net-http (0.6.0)
       uri
     net-http-persistent (4.0.5)
       connection_pool (~> 2.2)
-    net-imap (0.5.7)
+    net-imap (0.5.8)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.5.0)
+    net-smtp (0.5.1)
       net-protocol
     netrc (0.11.0)
     nio4r (2.7.4)
@@ -436,15 +428,18 @@ GEM
       ast (~> 2.4.1)
       racc
     pg (1.5.6)
+    pp (0.6.2)
+      prettyprint
     pr_geohash (1.0.0)
+    prettyprint (0.2.0)
     private_address_check (0.5.0)
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
     pry-byebug (3.10.1)
       byebug (~> 11.0)
       pry (>= 0.13, < 0.15)
-    psych (5.2.2)
+    psych (5.2.6)
       date
       stringio
     public_activity (3.0.1)
@@ -458,7 +453,7 @@ GEM
     pundit (2.3.1)
       activesupport (>= 3.0.0)
     racc (1.8.1)
-    rack (2.2.14)
+    rack (2.2.17)
     rack-cors (2.0.2)
       rack (>= 2.0.0)
     rack-oauth2 (2.2.0)
@@ -495,7 +490,7 @@ GEM
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
       activesupport (>= 5.0.1.rc1)
-    rails-dom-testing (2.2.0)
+    rails-dom-testing (2.3.0)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
@@ -521,7 +516,7 @@ GEM
       thor (~> 1.0, >= 1.2.2)
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
-    rake (13.2.1)
+    rake (13.3.0)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
@@ -590,7 +585,8 @@ GEM
     rdf-xsd (3.3.0)
       rdf (~> 3.3)
       rexml (~> 3.2)
-    rdoc (6.10.0)
+    rdoc (6.14.0)
+      erb
       psych (>= 4.0.0)
     recaptcha (5.15.0)
     redcarpet (3.6.0)
@@ -599,7 +595,7 @@ GEM
     redis-client (0.16.0)
       connection_pool
     regexp_parser (2.8.1)
-    reline (0.6.0)
+    reline (0.6.1)
       io-console (~> 0.5)
     responders (3.1.1)
       actionpack (>= 5.2)
@@ -613,7 +609,7 @@ GEM
       nokogiri
     rexml (3.4.0)
     rouge (4.1.3)
-    rsolr (2.5.0)
+    rsolr (2.6.0)
       builder (>= 2.1.2)
       faraday (>= 0.9, < 3, != 2.0.0)
     rss (0.3.0)
@@ -729,7 +725,14 @@ GEM
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    stringio (3.1.2)
+    stringio (3.1.7)
+    sunspot (2.7.1)
+      bigdecimal
+      pr_geohash (~> 1.0)
+      rsolr (>= 1.1.1, < 3)
+    sunspot_rails (2.7.1)
+      rails (>= 5)
+      sunspot (= 2.7.1)
     swd (2.0.2)
       activesupport (>= 3)
       attr_required (>= 0.0.5)
@@ -764,7 +767,7 @@ GEM
     unf_ext (0.0.8.2)
     unicode-display_width (2.4.2)
     unicode-types (1.10.0)
-    uri (0.13.2)
+    uri (1.0.3)
     useragent (0.16.11)
     validate_email (0.1.6)
       activemodel (>= 3.0)
@@ -789,7 +792,7 @@ GEM
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
     webrick (1.9.1)
-    websocket-driver (0.7.7)
+    websocket-driver (0.8.0)
       base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -801,7 +804,7 @@ GEM
       psych (>= 3.3)
       rdf (~> 3.3)
       rdf-xsd (~> 3.3)
-    zeitwerk (2.7.1)
+    zeitwerk (2.7.3)
 
 PLATFORMS
   ruby
@@ -886,7 +889,7 @@ DEPENDENCIES
   sitemap-parser
   sitemap_generator
   slim
-  sunspot_rails!
+  sunspot_rails
   terser
   tess_rdf_extractors!
   turbolinks

app/policies/learning_path_topic_policy.rb

@@ -5,11 +5,11 @@ def update?
   end
 
   def manage?
-    curators_and_admin
+    curators_and_admin || @user&.has_role?(:learning_path_curator)
   end
 
   def create?
-    curators_and_admin
+    manage?
   end
 
 end

docker-compose-prod.yml

@@ -1,4 +1,3 @@
-version: '3.8'
 services:
   app:
     container_name: ${PREFIX}-app

docker-compose.yml

@@ -1,4 +1,3 @@
-version: '3.8'
 services:
   app:
     container_name: ${PREFIX}-app

test/controllers/learning_path_topics_controller_test.rb

@@ -61,6 +61,10 @@ class LearningPathTopicsControllerTest < ActionController::TestCase
     get :new
     assert_response :success
 
+    sign_in users(:learning_path_curator)
+    get :new
+    assert_response :success
+
     sign_in users(:admin)
     get :new
     assert_response :success
@@ -103,6 +107,14 @@ class LearningPathTopicsControllerTest < ActionController::TestCase
     assert_redirected_to learning_path_topic_path(assigns(:learning_path_topic))
   end
 
+  test 'should create learning_path_topic for learning_path_curator' do
+    sign_in users(:learning_path_curator)
+    assert_difference('LearningPathTopic.count') do
+      post :create, params: { learning_path_topic: { title: @learning_path_topic.title, description: @learning_path_topic.description } }
+    end
+    assert_redirected_to learning_path_topic_path(assigns(:learning_path_topic))
+  end
+
   test 'should create learning_path_topic for admin' do
     sign_in users(:admin)
     assert_difference('LearningPathTopic.count') do