mumuki-laboratory 8.1.0 → 8.1.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/controllers/application_controller.rb +1 -0
- data/app/controllers/users_controller.rb +2 -1
- data/lib/mumuki/laboratory.rb +1 -1
- data/lib/mumuki/laboratory/version.rb +1 -1
- data/spec/features/terms_flow_spec.rb +12 -8
- metadata +100 -100
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 5feda4ed95a66abdfc68c218f1d2b5752fe6fdd8d8da0a18cc7c968d90550bbd
|
4
|
+
data.tar.gz: '080a983c6f384a8568ba2c8e7f092fcab9afe2a82b728bdfcc1e66fb8256377f'
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: f95a1a2057a7946e2f26589a50076ec7e3c0e3d538a3feeb75da6a7cd1e030598a048dbb2e8918f1dcf39aa6565bc22fec237c66c88ee6842503c4d0bf94947c
|
7
|
+
data.tar.gz: 006504d33b8cb9ea871cff01be16fbc9f4b9f89e8cab63f11e1bfcc41cb4384cf1aff2e6e501e053d9279a1dd3a2009ae0b6a5c242012ab311b0a1e1ed9702a5
|
@@ -131,6 +131,7 @@ class ApplicationController < ActionController::Base
|
|
131
131
|
|
132
132
|
def validate_accepted_role_terms!
|
133
133
|
if current_user&.has_role_terms_to_accept?
|
134
|
+
save_location_before! :terms_acceptance
|
134
135
|
flash.notice = I18n.t :accept_terms_to_continue
|
135
136
|
redirect_to terms_user_path
|
136
137
|
end
|
@@ -19,7 +19,8 @@ class UsersController < ApplicationController
|
|
19
19
|
|
20
20
|
def accept_profile_terms
|
21
21
|
current_user.accept_profile_terms!
|
22
|
-
|
22
|
+
flash.notice = I18n.t(:terms_accepted)
|
23
|
+
redirect_after! :terms_acceptance, fallback_location: root_path
|
23
24
|
end
|
24
25
|
|
25
26
|
def terms
|
data/lib/mumuki/laboratory.rb
CHANGED
@@ -14,6 +14,10 @@ feature 'Terms Flow', organization_workspace: :test do
|
|
14
14
|
let(:expected_terms) { [] }
|
15
15
|
let(:unexpected_terms) { all_terms_scopes - expected_terms }
|
16
16
|
|
17
|
+
let(:student) { create(:user, uid: 'user.student@mumuki.org', permissions: {student: 'test/*'}) }
|
18
|
+
|
19
|
+
let(:janitor) { create(:user, uid: 'user.janitor@mumuki.org', permissions: {student: 'test/*', janitor: 'other/*'}) }
|
20
|
+
|
17
21
|
before { reindex_current_organization! }
|
18
22
|
|
19
23
|
shared_context 'has expected terms' do
|
@@ -31,8 +35,6 @@ feature 'Terms Flow', organization_workspace: :test do
|
|
31
35
|
end
|
32
36
|
|
33
37
|
context 'with student logged in' do
|
34
|
-
let(:student) { create(:user, uid: 'test@mumuki.org', permissions: {student: 'test/*'}) }
|
35
|
-
|
36
38
|
before { set_current_user! student }
|
37
39
|
|
38
40
|
describe 'visit user terms path' do
|
@@ -60,8 +62,6 @@ feature 'Terms Flow', organization_workspace: :test do
|
|
60
62
|
end
|
61
63
|
|
62
64
|
context 'with janitor logged in' do
|
63
|
-
let(:janitor) { create(:user, uid: 'test@mumuki.org', permissions: {student: 'test/*', janitor: 'other/*'}) }
|
64
|
-
|
65
65
|
before { set_current_user! janitor }
|
66
66
|
|
67
67
|
describe 'visit user terms path' do
|
@@ -92,23 +92,27 @@ feature 'Terms Flow', organization_workspace: :test do
|
|
92
92
|
end
|
93
93
|
end
|
94
94
|
|
95
|
-
context 'with unaccepted
|
95
|
+
context 'with unaccepted role terms' do
|
96
96
|
|
97
97
|
context 'visit forum' do
|
98
98
|
let(:terms_path) { '/discussions/terms' }
|
99
99
|
before { test_organization.update! forum_enabled: true }
|
100
100
|
|
101
101
|
scenario 'with enabled forum' do
|
102
|
-
visit '/'
|
103
|
-
|
102
|
+
visit '/discussions'
|
104
103
|
expect(page).to have_text('Accept terms')
|
104
|
+
|
105
|
+
click_on 'Accept'
|
106
|
+
expect(page).to have_text('Discussions')
|
105
107
|
end
|
106
108
|
end
|
107
109
|
|
108
110
|
scenario 'visit any other path' do
|
109
111
|
visit '/'
|
110
|
-
|
111
112
|
expect(page).to have_text('Accept terms')
|
113
|
+
|
114
|
+
click_on 'Accept'
|
115
|
+
expect(page).to have_text(test_organization.book.name)
|
112
116
|
end
|
113
117
|
|
114
118
|
scenario 'visit user path' do
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: mumuki-laboratory
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 8.1.
|
4
|
+
version: 8.1.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Franco Bulgarelli
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2020-12-
|
11
|
+
date: 2020-12-06 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|
@@ -849,121 +849,121 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
849
849
|
- !ruby/object:Gem::Version
|
850
850
|
version: '0'
|
851
851
|
requirements: []
|
852
|
-
rubygems_version: 3.
|
852
|
+
rubygems_version: 3.1.2
|
853
853
|
signing_key:
|
854
854
|
specification_version: 4
|
855
855
|
summary: Code assement web application for the Mumuki Platform.
|
856
856
|
test_files:
|
857
|
-
- spec/controllers/guide_progress_controller_spec.rb
|
858
|
-
- spec/controllers/discussions_controller_spec.rb
|
859
|
-
- spec/controllers/organizations_api_controller_spec.rb
|
860
|
-
- spec/controllers/chapters_controller_spec.rb
|
861
|
-
- spec/controllers/invitations_controller_spec.rb
|
862
|
-
- spec/controllers/messages_controller_spec.rb
|
863
|
-
- spec/controllers/courses_api_controller_spec.rb
|
864
|
-
- spec/controllers/confirmations_controller_spec.rb
|
865
|
-
- spec/controllers/students_api_controller_spec.rb
|
866
|
-
- spec/controllers/api_clients_controller.rb
|
867
|
-
- spec/controllers/exercise_solutions_controller_spec.rb
|
868
|
-
- spec/controllers/discussions_messages_controller_spec.rb
|
869
|
-
- spec/controllers/users_api_controller_spec.rb
|
870
|
-
- spec/controllers/users_controller_spec.rb
|
871
|
-
- spec/spec_helper.rb
|
872
|
-
- spec/api_helper.rb
|
873
|
-
- spec/mailers/user_mailer_spec.rb
|
874
|
-
- spec/mailers/previews/user_mailer_preview.rb
|
875
|
-
- spec/javascripts/elipsis-spec.js
|
876
|
-
- spec/javascripts/csrf-token-spec.js
|
877
|
-
- spec/javascripts/global-spec.js
|
878
|
-
- spec/javascripts/events-spec.js
|
879
857
|
- spec/javascripts/gamification-spec.js
|
880
|
-
- spec/javascripts/
|
881
|
-
- spec/javascripts/
|
882
|
-
- spec/javascripts/
|
858
|
+
- spec/javascripts/csrf-token-spec.js
|
859
|
+
- spec/javascripts/results-renderers-spec.js
|
860
|
+
- spec/javascripts/bridge-spec.js
|
883
861
|
- spec/javascripts/editors-spec.js
|
884
862
|
- spec/javascripts/spec-helper.js
|
885
|
-
- spec/javascripts/speech-bubble-renderer-spec.js
|
886
863
|
- spec/javascripts/submissions-store-spec.js
|
887
|
-
- spec/javascripts/results-renderers-spec.js
|
888
|
-
- spec/javascripts/bridge-spec.js
|
889
864
|
- spec/javascripts/timeout-spec.js
|
890
|
-
- spec/
|
891
|
-
- spec/
|
892
|
-
- spec/
|
893
|
-
- spec/
|
894
|
-
- spec/
|
895
|
-
- spec/
|
896
|
-
- spec/
|
897
|
-
- spec/
|
865
|
+
- spec/javascripts/timer-spec.js
|
866
|
+
- spec/javascripts/events-spec.js
|
867
|
+
- spec/javascripts/exercise-spec.js
|
868
|
+
- spec/javascripts/speech-bubble-renderer-spec.js
|
869
|
+
- spec/javascripts/elipsis-spec.js
|
870
|
+
- spec/javascripts/sync-mode-spec.js
|
871
|
+
- spec/javascripts/global-spec.js
|
872
|
+
- spec/spec_helper.rb
|
873
|
+
- spec/dummy/config/locales/en.yml
|
874
|
+
- spec/dummy/config/spring.rb
|
875
|
+
- spec/dummy/config/database.travis.yml
|
876
|
+
- spec/dummy/config/secrets.yml
|
877
|
+
- spec/dummy/config/puma.rb
|
878
|
+
- spec/dummy/config/environment.rb
|
879
|
+
- spec/dummy/config/application.rb
|
880
|
+
- spec/dummy/config/database.yml
|
881
|
+
- spec/dummy/config/rabbit.yml
|
882
|
+
- spec/dummy/config/boot.rb
|
883
|
+
- spec/dummy/config/routes.rb
|
884
|
+
- spec/dummy/config/cable.yml
|
885
|
+
- spec/dummy/config/environments/test.rb
|
886
|
+
- spec/dummy/config/environments/development.rb
|
887
|
+
- spec/dummy/config/initializers/wrap_parameters.rb
|
888
|
+
- spec/dummy/config/initializers/assets.rb
|
889
|
+
- spec/dummy/config/initializers/cookies_serializer.rb
|
890
|
+
- spec/dummy/config/initializers/filter_parameter_logging.rb
|
891
|
+
- spec/dummy/config.ru
|
892
|
+
- spec/dummy/public/medal/outline.svg
|
893
|
+
- spec/dummy/public/character/animations.json
|
894
|
+
- spec/dummy/public/error/403.svg
|
895
|
+
- spec/dummy/public/error/410.svg
|
896
|
+
- spec/dummy/public/error/timeout_3.svg
|
897
|
+
- spec/dummy/public/error/401.svg
|
898
|
+
- spec/dummy/public/error/500.svg
|
899
|
+
- spec/dummy/public/error/404.svg
|
900
|
+
- spec/dummy/public/error/timeout_2.svg
|
901
|
+
- spec/dummy/public/error/timeout_1.svg
|
902
|
+
- spec/dummy/bin/yarn
|
903
|
+
- spec/dummy/bin/rails
|
904
|
+
- spec/dummy/bin/setup
|
905
|
+
- spec/dummy/bin/update
|
906
|
+
- spec/dummy/bin/rake
|
907
|
+
- spec/dummy/bin/bundle
|
908
|
+
- spec/dummy/db/seeds.rb
|
909
|
+
- spec/dummy/db/schema.rb
|
910
|
+
- spec/dummy/package.json
|
911
|
+
- spec/dummy/Rakefile
|
912
|
+
- spec/evaluation_helper.rb
|
898
913
|
- spec/helpers/page_title_helper_spec.rb
|
899
914
|
- spec/helpers/test_results_rendering_spec.rb
|
915
|
+
- spec/helpers/with_choices_spec.rb
|
916
|
+
- spec/helpers/authors_helper_spec.rb
|
917
|
+
- spec/helpers/avatar_helper_spec.rb
|
900
918
|
- spec/helpers/icons_helper_spec.rb
|
901
|
-
- spec/
|
902
|
-
- spec/
|
903
|
-
- spec/
|
919
|
+
- spec/helpers/email_helper_spec.rb
|
920
|
+
- spec/helpers/application_helper_spec.rb
|
921
|
+
- spec/helpers/breadcrumbs_helper_spec.rb
|
922
|
+
- spec/helpers/with_navigation_spec.rb
|
923
|
+
- spec/helpers/exercise_input_helper_spec.rb
|
924
|
+
- spec/login_helper.rb
|
925
|
+
- spec/mailers/previews/user_mailer_preview.rb
|
926
|
+
- spec/mailers/user_mailer_spec.rb
|
927
|
+
- spec/controllers/guide_progress_controller_spec.rb
|
928
|
+
- spec/controllers/students_api_controller_spec.rb
|
929
|
+
- spec/controllers/messages_controller_spec.rb
|
930
|
+
- spec/controllers/users_api_controller_spec.rb
|
931
|
+
- spec/controllers/chapters_controller_spec.rb
|
932
|
+
- spec/controllers/users_controller_spec.rb
|
933
|
+
- spec/controllers/discussions_messages_controller_spec.rb
|
934
|
+
- spec/controllers/courses_api_controller_spec.rb
|
935
|
+
- spec/controllers/organizations_api_controller_spec.rb
|
936
|
+
- spec/controllers/api_clients_controller.rb
|
937
|
+
- spec/controllers/discussions_controller_spec.rb
|
938
|
+
- spec/controllers/exercise_solutions_controller_spec.rb
|
939
|
+
- spec/controllers/confirmations_controller_spec.rb
|
940
|
+
- spec/controllers/invitations_controller_spec.rb
|
941
|
+
- spec/capybara_helper.rb
|
942
|
+
- spec/teaspoon_env.rb
|
904
943
|
- spec/features/disable_user_flow_spec.rb
|
944
|
+
- spec/features/invitations_flow_spec.rb
|
945
|
+
- spec/features/topic_flow_spec.rb
|
946
|
+
- spec/features/guide_reset_spec.rb
|
947
|
+
- spec/features/discussion_flow_spec.rb
|
905
948
|
- spec/features/links_flow_spec.rb
|
949
|
+
- spec/features/not_found_private_flow_spec.rb
|
906
950
|
- spec/features/not_found_public_flow_spec.rb
|
907
|
-
- spec/features/standard_flow_spec.rb
|
908
951
|
- spec/features/exercise_flow_spec.rb
|
909
|
-
- spec/features/
|
910
|
-
- spec/features/immersive_redirection_spec.rb
|
911
|
-
- spec/features/topic_flow_spec.rb
|
912
|
-
- spec/features/home_private_flow_spec.rb
|
913
|
-
- spec/features/profile_flow_spec.rb
|
914
|
-
- spec/features/home_public_flow_spec.rb
|
952
|
+
- spec/features/standard_flow_spec.rb
|
915
953
|
- spec/features/menu_bar_spec.rb
|
916
|
-
- spec/features/not_found_private_flow_spec.rb
|
917
|
-
- spec/features/chapter_spec.rb
|
918
|
-
- spec/features/discussion_flow_spec.rb
|
919
|
-
- spec/features/invitations_flow_spec.rb
|
920
|
-
- spec/features/exams_flow_spec.rb
|
921
|
-
- spec/features/guides_flow_spec.rb
|
922
954
|
- spec/features/dynamic_exam_spec.rb
|
955
|
+
- spec/features/immersive_redirection_spec.rb
|
956
|
+
- spec/features/runner_assets_spec.rb
|
957
|
+
- spec/features/progressive_tips_spec.rb
|
958
|
+
- spec/features/chapter_spec.rb
|
923
959
|
- spec/features/terms_flow_spec.rb
|
924
|
-
- spec/features/lessons_flow_spec.rb
|
925
960
|
- spec/features/login_flow_spec.rb
|
926
|
-
- spec/features/
|
927
|
-
- spec/
|
928
|
-
- spec/
|
929
|
-
- spec/
|
930
|
-
- spec/
|
931
|
-
- spec/
|
932
|
-
- spec/
|
933
|
-
- spec/
|
934
|
-
- spec/
|
935
|
-
- spec/dummy/public/error/timeout_3.svg
|
936
|
-
- spec/dummy/public/error/410.svg
|
937
|
-
- spec/dummy/public/error/404.svg
|
938
|
-
- spec/dummy/public/error/timeout_1.svg
|
939
|
-
- spec/dummy/public/error/403.svg
|
940
|
-
- spec/dummy/public/medal/outline.svg
|
941
|
-
- spec/dummy/package.json
|
942
|
-
- spec/dummy/config/initializers/filter_parameter_logging.rb
|
943
|
-
- spec/dummy/config/initializers/wrap_parameters.rb
|
944
|
-
- spec/dummy/config/initializers/cookies_serializer.rb
|
945
|
-
- spec/dummy/config/initializers/assets.rb
|
946
|
-
- spec/dummy/config/database.yml
|
947
|
-
- spec/dummy/config/routes.rb
|
948
|
-
- spec/dummy/config/cable.yml
|
949
|
-
- spec/dummy/config/spring.rb
|
950
|
-
- spec/dummy/config/boot.rb
|
951
|
-
- spec/dummy/config/puma.rb
|
952
|
-
- spec/dummy/config/environments/development.rb
|
953
|
-
- spec/dummy/config/environments/test.rb
|
954
|
-
- spec/dummy/config/database.travis.yml
|
955
|
-
- spec/dummy/config/rabbit.yml
|
956
|
-
- spec/dummy/config/secrets.yml
|
957
|
-
- spec/dummy/config/locales/en.yml
|
958
|
-
- spec/dummy/config/application.rb
|
959
|
-
- spec/dummy/config/environment.rb
|
960
|
-
- spec/dummy/Rakefile
|
961
|
-
- spec/dummy/bin/setup
|
962
|
-
- spec/dummy/bin/rake
|
963
|
-
- spec/dummy/bin/bundle
|
964
|
-
- spec/dummy/bin/update
|
965
|
-
- spec/dummy/bin/yarn
|
966
|
-
- spec/dummy/bin/rails
|
967
|
-
- spec/dummy/config.ru
|
968
|
-
- spec/teaspoon_env.rb
|
969
|
-
- spec/capybara_helper.rb
|
961
|
+
- spec/features/home_public_flow_spec.rb
|
962
|
+
- spec/features/profile_flow_spec.rb
|
963
|
+
- spec/features/lessons_flow_spec.rb
|
964
|
+
- spec/features/disabled_organization_flow_spec.rb
|
965
|
+
- spec/features/complements_flow_spec.rb
|
966
|
+
- spec/features/exams_flow_spec.rb
|
967
|
+
- spec/features/guides_flow_spec.rb
|
968
|
+
- spec/features/home_private_flow_spec.rb
|
969
|
+
- spec/api_helper.rb
|