-
- <% num_section_questions = @section.status["sections"][section.id]["num_questions"] %>
- <% num_section_answers = @section.status["sections"][section.id]["num_answers"] %>
+ <% num_section_questions = @plan.status["sections"][section.id]["num_questions"] %>
+ <% num_section_answers = @plan.status["sections"][section.id]["num_answers"] %>
<% question_word = "questions" %>
<% if num_section_questions == 1 then %>
<% question_word = "question" %>
@@ -148,7 +147,7 @@
-<%= render :partial => "export", locals: {plan: @plan} %>
+<%= render :partial => "export", locals: {plan: @plan, phase: @phase} %>
<% session.delete(:question_id_comments)%>
diff --git a/db/seeds.rb b/db/seeds.rb
index 7584852..16d57b8 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -184,8 +184,8 @@
surname: "Admin",
password: "password123",
password_confirmation: "password123",
- org: Org.find_by(abbreviation: 'CC'),
- language: Language.find_by(abbreviation: I18n.locale),
+ org: Org.find_by(abbreviation: Rails.configuration.branding[:organisation][:abbreviation]),
+ language: Language.find_by(abbreviation: FastGettext.locale),
perms: Perm.all,
accept_terms: true,
confirmed_at: Time.zone.now},
@@ -195,7 +195,7 @@
password: "password123",
password_confirmation: "password123",
org: Org.find_by(abbreviation: 'GA'),
- language: Language.find_by(abbreviation: I18n.locale),
+ language: Language.find_by(abbreviation: FastGettext.locale),
perms: Perm.where.not(name: ['admin', 'add_organisations', 'change_org_affiliation', 'grant_api_to_orgs']),
accept_terms: true,
confirmed_at: Time.zone.now},
@@ -205,7 +205,7 @@
password: "password123",
password_confirmation: "password123",
org: Org.find_by(abbreviation: 'UOS'),
- language: Language.find_by(abbreviation: I18n.locale),
+ language: Language.find_by(abbreviation: FastGettext.locale),
perms: Perm.where.not(name: ['admin', 'add_organisations', 'change_org_affiliation', 'grant_api_to_orgs']),
accept_terms: true,
confirmed_at: Time.zone.now},
@@ -215,7 +215,7 @@
password: "password123",
password_confirmation: "password123",
org: Org.find_by(abbreviation: 'UOS'),
- language: Language.find_by(abbreviation: I18n.locale),
+ language: Language.find_by(abbreviation: FastGettext.locale),
accept_terms: true,
confirmed_at: Time.zone.now}
]
@@ -225,7 +225,7 @@
# -------------------------------------------------------
guidance_groups = [
{name: "Generic Guidance (provided by the example curation centre)",
- org: Org.find_by(abbreviation: 'CC'),
+ org: Org.find_by(abbreviation: Rails.configuration.branding[:organisation][:abbreviation]),
optional_subset: true,
published: true},
{name: "Government Agency Advice (Funder specific guidance)",
@@ -344,7 +344,7 @@
{title: "My Curation Center's Default Template",
description: "The default template",
published: true,
- org: Org.find_by(abbreviation: 'CC'),
+ org: Org.find_by(abbreviation: Rails.configuration.branding[:organisation][:abbreviation]),
is_default: true,
version: 1},
diff --git a/test/functional/answers_controller_test.rb b/test/functional/answers_controller_test.rb
index 852504c..36cceea 100644
--- a/test/functional/answers_controller_test.rb
+++ b/test/functional/answers_controller_test.rb
@@ -1,3 +1,5 @@
+require 'test_helper'
+
class AnswersControllerTest < ActionDispatch::IntegrationTest
include Devise::Test::IntegrationHelpers
diff --git a/test/functional/application_controller_test.rb b/test/functional/application_controller_test.rb
index e1e5fcc..5af6367 100644
--- a/test/functional/application_controller_test.rb
+++ b/test/functional/application_controller_test.rb
@@ -41,6 +41,7 @@
test "a user's org language specification gets picked up and used if the user has no language setting" do
if LANGUAGES.count > 1
@user.language = nil
+
@user.org[:language_id] = LANGUAGES.last.id
@user.save!
diff --git a/test/functional/confirmations_controller_test.rb b/test/functional/confirmations_controller_test.rb
new file mode 100644
index 0000000..ead70fb
--- /dev/null
+++ b/test/functional/confirmations_controller_test.rb
@@ -0,0 +1,34 @@
+require 'test_helper'
+
+class ConfirmationsControllerTest < ActionDispatch::IntegrationTest
+
+ include Devise::Test::IntegrationHelpers
+
+ test 'make sure the user is redirected to the home page after confirming their email address' do
+ @user = User.first
+ @user.confirmed_at = nil
+ @user.confirmation_token = 'ABCD1234'
+ @user.confirmation_sent_at = Time.now
+ @user.save!
+
+ # Make sure invalid token results in
+ get "#{root_url}/users/confirmation?confirmation_token=ZXYW0987"
+ assert_response :success
+ assert_select '.main_page_content h2', _('Resend confirmation instructions')
+
+ get "#{root_url}/users/confirmation?confirmation_token=ABCD1234"
+ assert_response :redirect
+ assert_redirected_to root_url
+ follow_redirects
+ assert_select '.main_page_content h2', _('Welcome.')
+ @user.reload
+ assert_not @user.confirmed_at.nil?, "Expected the confirmed_at value to have been set!"
+
+ # Make sure that we cannot reconfirm again
+ get "#{root_url}/users/confirmation?confirmation_token=ABCD1234"
+ assert_response :success
+ assert_select '.main_page_content h2', _('Resend confirmation instructions')
+
+ end
+
+end
\ No newline at end of file
diff --git a/test/functional/guidance_groups_controller_test.rb b/test/functional/guidance_groups_controller_test.rb
new file mode 100644
index 0000000..a8d75fb
--- /dev/null
+++ b/test/functional/guidance_groups_controller_test.rb
@@ -0,0 +1,143 @@
+require 'test_helper'
+
+class GuidanceGroupsControllerTest < ActionDispatch::IntegrationTest
+
+ include Devise::Test::IntegrationHelpers
+
+ # TODO: The following methods SHOULD replace the old 'admin_' prefixed methods. The routes file already has
+ # these defined. They are defined multiple times though and we need to clean this up! In particular
+ # look at the unnamed routes after 'new_plan_phase' below. They are not named because they are duplicates.
+ # We should just have:
+ #
+ # SHOULD BE:
+ # --------------------------------------------------
+ # guidance_groups GET /guidance_groups guidance_groups#index
+ # POST /guidance_groups guidance_groups#create
+ # guidance_group GET /guidance_group/:id guidance_groups#show
+ # PATCH /guidance_groups/:id guidance_groups#update
+ # PUT /guidance_groups/:id guidance_groups#update
+ # DELETE /guidance_groups/:id guidance_groups#destroy
+ #
+ # CURRENT RESULTS OF `rake routes`
+ # --------------------------------------------------
+ # admin_show_guidance_group GET /org/admin/guidancegroup/:id/admin_show guidance_groups#admin_show
+ # admin_new_guidance_group GET /org/admin/guidancegroup/:id/admin_new guidance_groups#admin_new
+ # admin_edit_guidance_group GET /org/admin/guidancegroup/:id/admin_edit guidance_groups#admin_edit
+ # admin_destroy_guidance_group DELETE /org/admin/guidancegroup/:id/admin_destroy guidance_groups#admin_destroy
+ # admin_create_guidance_group POST /org/admin/guidancegroup/:id/admin_create guidance_groups#admin_create
+ # admin_update_guidance_group PUT /org/admin/guidancegroup/:id/admin_update guidance_groups#admin_update
+
+ setup do
+ scaffold_org_admin(GuidanceGroup.first.org)
+ end
+
+ # GET /org/admin/guidancegroup/:id/admin_show (admin_show_guidance_group_path)
+ # ----------------------------------------------------------
+ test 'show the guidance_group' do
+ # Should redirect user to the root path if they are not logged in!
+ get admin_show_guidance_group_path(GuidanceGroup.find_by(org: @user.org))
+ assert_unauthorized_redirect_to_root_path
+
+ sign_in @user
+
+ get admin_show_guidance_group_path(GuidanceGroup.find_by(org: @user.org))
+ assert_response :success
+ end
+
+ # GET /org/admin/guidancegroup/:id/admin_new (admin_new_guidance_group_path)
+ # ----------------------------------------------------------
+ test 'load the new guidance_group page' do
+ # Should redirect user to the root path if they are not logged in!
+ # TODO: Why is there an id here!? its a new guidance_group!
+ get admin_new_guidance_group_path(@user.org)
+ assert_unauthorized_redirect_to_root_path
+
+ sign_in @user
+
+ get admin_new_guidance_group_path(@user.org)
+ assert_response :success
+ end
+
+ # POST /org/admin/guidancegroup/:id/admin_create (admin_create_guidance_group_path)
+ # ----------------------------------------------------------
+ test 'create a new guidance_group' do
+ params = {org_id: @user.org.id, published: false, name: 'Testing create'}
+
+ # Should redirect user to the root path if they are not logged in!
+ post admin_create_guidance_group_path(@user.org), {guidance_group: params}
+ assert_unauthorized_redirect_to_root_path
+
+ sign_in @user
+
+ post admin_create_guidance_group_path(@user.org), {guidance_group: params}
+ assert_response :redirect
+ assert_redirected_to admin_index_guidance_path(@user.org)
+ assert_equal _('Guidance group was successfully created.'), flash[:notice]
+ assert assigns(:guidance_group)
+ assert_equal 'Testing create', GuidanceGroup.last.name, "expected the record to have been created!"
+
+ # Invalid object
+ post admin_create_guidance_group_path(@user.org), {guidance_group: {name: nil}}
+ assert flash[:notice].starts_with?(_('Could not create your'))
+ assert_response :success
+ assert assigns(:guidance_group)
+ end
+
+ # GET /org/admin/guidancegroup/:id/admin_edit (admin_edit_guidance_group_path)
+ # ----------------------------------------------------------
+ test 'load the edit guidance_group page' do
+ # Should redirect user to the root path if they are not logged in!
+ get admin_edit_guidance_group_path(GuidanceGroup.find_by(org: @user.org))
+ assert_unauthorized_redirect_to_root_path
+
+ sign_in @user
+
+ get admin_edit_guidance_group_path(GuidanceGroup.find_by(org: @user.org))
+ assert_response :success
+ end
+
+ # PUT /org/admin/templates/:id/admin_template (admin_update_guidance_group_path)
+ # ----------------------------------------------------------
+ test 'update the guidance_group' do
+ params = {name: 'Testing UPDATE'}
+
+ # Should redirect user to the root path if they are not logged in!
+ put admin_update_guidance_group_path(GuidanceGroup.first), {guidance_group: params}
+ assert_unauthorized_redirect_to_root_path
+
+ sign_in @user
+
+ put admin_update_guidance_group_path(GuidanceGroup.first), {guidance_group: params}
+ assert_equal _('Guidance group was successfully updated.'), flash[:notice]
+ assert_response :redirect
+ assert_redirected_to "#{admin_index_guidance_path(@user.org)}?name=Testing+UPDATE"
+ assert assigns(:guidance_group)
+ assert_equal 'Testing UPDATE', GuidanceGroup.first.name, "expected the record to have been updated"
+
+ # Invalid object
+ put admin_update_guidance_group_path(GuidanceGroup.first), {guidance_group: {name: nil}}
+ assert flash[:notice].starts_with?(_('Could not update your'))
+ assert_response :success
+ assert assigns(:guidance_group)
+ end
+
+ # DELETE /org/admin/guidancegroup/:id/admin_destroy (admin_destroy_guidance_group_path)
+ # ----------------------------------------------------------
+ test 'delete the guidance_group' do
+ id = GuidanceGroup.first.id
+ # Should redirect user to the root path if they are not logged in!
+ delete admin_destroy_guidance_group_path(GuidanceGroup.first)
+ assert_unauthorized_redirect_to_root_path
+
+ sign_in @user
+
+ delete admin_destroy_guidance_group_path(GuidanceGroup.first)
+ assert_response :redirect
+ assert_redirected_to admin_index_guidance_path
+ assert_equal _('Guidance group was successfully deleted.'), flash[:notice]
+ assert_raise ActiveRecord::RecordNotFound do
+ GuidanceGroup.find(id).nil?
+ end
+ end
+
+end
\ No newline at end of file
diff --git a/test/functional/guidances_controller_test.rb b/test/functional/guidances_controller_test.rb
new file mode 100644
index 0000000..144bc71
--- /dev/null
+++ b/test/functional/guidances_controller_test.rb
@@ -0,0 +1,170 @@
+require 'test_helper'
+
+class GuidancesControllerTest < ActionDispatch::IntegrationTest
+
+ include Devise::Test::IntegrationHelpers
+
+ # TODO: The following methods SHOULD replace the old 'admin_' prefixed methods. The routes file already has
+ # these defined. They are defined multiple times though and we need to clean this up:
+ #
+ # SHOULD BE:
+ # --------------------------------------------------
+ # guidances GET /guidances guidances#index
+ # POST /guidances guidances#create
+ # guidance GET /guidance/:id guidances#show
+ # PATCH /guidance/:id guidances#update
+ # PUT /guidance/:id guidances#update
+ # DELETE /guidance/:id guidances#destroy
+ #
+ # CURRENT RESULTS OF `rake routes`
+ # --------------------------------------------------
+ # admin_show_guidance GET /org/admin/guidance/:id/admin_show guidances#admin_show
+ # admin_index_guidance GET /org/admin/guidance/:id/admin_index guidances#admin_index
+ # admin_edit_guidance GET /org/admin/guidance/:id/admin_edit guidances#admin_edit
+ # admin_new_guidance GET /org/admin/guidance/:id/admin_new guidances#admin_new
+ # admin_destroy_guidance DELETE /org/admin/guidance/:id/admin_destroy guidances#admin_destroy
+ # admin_create_guidance POST /org/admin/guidance/:id/admin_create guidances#admin_create
+ # admin_update_guidance PUT /org/admin/guidance/:id/admin_update guidances#admin_update
+ # update_phases_guidance GET /org/admin/guidance/:id/update_phases guidances#update_phases
+ # update_versions_guidance GET /org/admin/guidance/:id/update_versions guidances#update_versions
+ # update_sections_guidance GET /org/admin/guidance/:id/update_sections guidances#update_sections
+ # update_questions_guidance GET /org/admin/guidance/:id/update_questions guidances#update_questions
+
+ setup do
+ scaffold_org_admin(GuidanceGroup.first.org)
+ @guidance_group = GuidanceGroup.first
+ end
+
+ # GET /org/admin/guidance/:id/admin_index (admin_index_guidance_path)
+ # ----------------------------------------------------------
+ test 'load the list of guidances page' do
+ # Should redirect user to the root path if they are not logged in!
+ get admin_index_guidance_path(@guidance_group)
+ assert_unauthorized_redirect_to_root_path
+
+ sign_in @user
+
+ get admin_index_guidance_path(@guidance_group)
+ assert_response :success
+ assert assigns(:guidances)
+ assert assigns(:guidance_groups)
+ end
+
+ # GET /org/admin/guidance/:id/admin_show (admin_show_guidance_path)
+ # ----------------------------------------------------------
+ test 'load the guidance page' do
+ # Should redirect user to the root path if they are not logged in!
+ # TODO: Why is there an id here!? its a new guidance_group!
+ get admin_show_guidance_path(guidance_group_id: @guidance_group.id, id: @guidance_group.guidances.first.id)
+ assert_unauthorized_redirect_to_root_path
+
+ sign_in @user
+
+ get admin_show_guidance_path(guidance_group_id: @guidance_group.id, id: @guidance_group.guidances.first.id)
+ assert_response :success
+ assert assigns(:guidance)
+ end
+
+ # /org/admin/guidance/:id/admin_new (admin_new_guidance_path)
+ # ----------------------------------------------------------
+ test 'load the new guidance page' do
+ # Should redirect user to the root path if they are not logged in!
+ get admin_new_guidance_path(@guidance_group)
+ assert_unauthorized_redirect_to_root_path
+
+ sign_in @user
+
+ get admin_new_guidance_path(@guidance_group)
+ assert_response :success
+ assert assigns(:guidance)
+ assert assigns(:guidance_groups)
+ assert assigns(:themes)
+ end
+
+ # /org/admin/guidance/:id/admin_edit (admin_edit_guidance_path)
+ # ----------------------------------------------------------
+ test 'load the edit guidance page' do
+ # Should redirect user to the root path if they are not logged in!
+ get admin_edit_guidance_path(@guidance_group)
+ assert_unauthorized_redirect_to_root_path
+
+ sign_in @user
+
+ get admin_edit_guidance_path(@guidance_group)
+ assert_response :success
+ assert assigns(:guidance)
+ assert assigns(:guidance_groups)
+ assert assigns(:themes)
+ end
+
+ # POST /org/admin/guidance/:id/admin_create (admin_create_guidance_path)
+ # ----------------------------------------------------------
+ test 'create a new guidance' do
+ params = {'guidance-text': 'Testing create', guidance: {guidance_group_id: GuidanceGroup.first.id, published: true}}
+
+ # Should redirect user to the root path if they are not logged in!
+ post admin_create_guidance_path(@user.org), params
+ assert_unauthorized_redirect_to_root_path
+
+ sign_in @user
+
+ post admin_create_guidance_path(@user.org), params
+ assert_response :redirect
+ assert_redirected_to admin_show_guidance_path(Guidance.last)
+ assert_equal _('Guidance was successfully created.'), flash[:notice]
+ assert assigns(:guidance)
+ assert_equal 'Testing create', Guidance.last.text, "expected the record to have been created!"
+
+ # Invalid object
+ post admin_create_guidance_path(@user.org), {'guidance-text': nil, guidance: {published: false}}
+ assert flash[:notice].starts_with?(_('Could not create your'))
+ assert_response :success
+ assert assigns(:guidance)
+ end
+
+ # PUT /org/admin/guidance/:id/admin_update (admin_update_guidance_path)
+ # ----------------------------------------------------------
+ test 'update the guidance' do
+ params = {'guidance-text': 'Testing UPDATE', guidance: {guidance_group_id: GuidanceGroup.first.id}}
+
+ # Should redirect user to the root path if they are not logged in!
+ put admin_update_guidance_path(Guidance.first), params
+ assert_unauthorized_redirect_to_root_path
+
+ sign_in @user
+
+ put admin_update_guidance_path(Guidance.first), params
+ assert_response :redirect
+ assert_equal _('Guidance was successfully updated.'), flash[:notice]
+ assert_redirected_to "#{admin_show_guidance_path(Guidance.first)}?guidance_group_id=#{GuidanceGroup.first.id}"
+ assert assigns(:guidance)
+ assert_equal 'Testing UPDATE', Guidance.first.text, "expected the record to have been updated"
+
+ # Invalid object
+ put admin_update_guidance_path(Guidance.first), {'guidance-text': nil, guidance: {guidance_group_id: GuidanceGroup.first.id}}
+ assert flash[:notice].starts_with?(_('Could not update your'))
+ assert_response :success
+ assert assigns(:guidance)
+ end
+
+ # DELETE /org/admin/guidance/:id/admin_destroy (admin_destroy_guidance_path)
+ # ----------------------------------------------------------
+ test 'delete the guidance' do
+ id = Guidance.first.id
+ # Should redirect user to the root path if they are not logged in!
+ delete admin_destroy_guidance_path(Guidance.first)
+ assert_unauthorized_redirect_to_root_path
+
+ sign_in @user
+
+ delete admin_destroy_guidance_path(Guidance.first)
+ assert_response :redirect
+ assert_redirected_to admin_index_guidance_path
+ assert_equal _('Guidance was successfully deleted.'), flash[:notice]
+ assert assigns(:guidance)
+ assert_raise ActiveRecord::RecordNotFound do
+ Guidance.find(id).nil?
+ end
+ end
+
+end
\ No newline at end of file
diff --git a/test/functional/home_controller_test.rb b/test/functional/home_controller_test.rb
new file mode 100644
index 0000000..a585c99
--- /dev/null
+++ b/test/functional/home_controller_test.rb
@@ -0,0 +1,40 @@
+require 'test_helper'
+
+class HomeControllerTest < ActionDispatch::IntegrationTest
+
+ include Devise::Test::IntegrationHelpers
+
+ setup do
+ @user = User.create(email: 'testing.another@user.account.org', password: 'password123',
+ password_confirmation: 'password123', accept_terms: true,
+ confirmed_at: Time.zone.now)
+ end
+
+ # ----------------------------------------------------------
+ test 'redirects logged in user to plans page' do
+ @user.firstname = 'Testing'
+ @user.surname = 'Another'
+ @user.save!
+
+ sign_in @user
+
+ get root_path
+ assert_response :redirect
+ assert_redirected_to plans_url
+ end
+
+ # ----------------------------------------------------------
+ test 'redirects logged in user to profile page if they have not added their name' do
+ sign_in @user
+
+ get root_path
+ assert_response :redirect
+
+# TODO: This should be redirecting to the profile page so that the user can provide their name but the logic
+# in the User model will always return the email address as the name so the check in the controller
+# is always true and sends the user through to the plans page
+ #assert_redirected_to edit_user_registration_path
+ assert_redirected_to plans_url
+ end
+
+end
\ No newline at end of file
diff --git a/test/functional/notes_controller_test.rb b/test/functional/notes_controller_test.rb
new file mode 100644
index 0000000..65bc55a
--- /dev/null
+++ b/test/functional/notes_controller_test.rb
@@ -0,0 +1,151 @@
+require 'test_helper'
+
+class NotesControllerTest < ActionDispatch::IntegrationTest
+
+ include Devise::Test::IntegrationHelpers
+
+ setup do
+ @user = User.last
+
+ scaffold_plan
+
+ @question = Question.create(text: 'Answer Testing', number: 9,
+ section: @plan.template.phases.first.sections.first,
+ question_format: QuestionFormat.find_by(option_based: false))
+
+ @answer = Answer.create(user: @user, plan: @plan, question: @question, text: 'Testing')
+
+ @note = Note.create(user: @user, plan: @plan, answer: @answer, question: @question, archived: false,
+ text: 'Test Note')
+ end
+
+# TODO: The following methods SHOULD probably be restful
+#
+# SHOULD BE:
+# --------------------------------------------------
+# notes GET /answers/:answer_id/notes notes#index
+# POST /answers/:answer_id/notes notes#create
+# note GET /answers/:answer_id/notes/:id notes#show
+# PATCH /answers/:answer_id/notes/:id notes#update
+# PUT /answers/:answer_id/notes/:id notes#update
+# DELETE /answers/:answer_id/notes/:id notes#destroy
+#
+# CURRENT RESULTS OF `rake routes`
+# --------------------------------------------------
+# archive_note PATCH /notes/:id/archive notes#archive
+# notes POST /notes notes#create
+# note PATCH /notes/:id notes#update
+# PUT /notes/:id notes#update
+
+
+
+ # POST /notes (notes_path)
+ # ----------------------------------------------------------
+ test "create a new note" do
+ params = {user_id: @user.id, answer_id: @answer.id, plan_id: @plan.id, question_id: @question.id,
+ "#{@question.id}new_note_text": 'Test Note'}
+
+ # Should redirect user to the root path if they are not logged in!
+ post notes_path, {new_note: params}
+ assert_unauthorized_redirect_to_root_path
+
+ sign_in @user
+
+ post notes_path, {new_note: params}, {'ACCEPT': 'text/javascript'}
+ assert_response :success
+ assert assigns(:note)
+ assert assigns(:plan)
+ assert assigns(:answer)
+ assert assigns(:question)
+ assert assigns(:notice)
+ assert assigns(:num_notes)
+# TODO: We don't appear to be displaying the success/failure notice anywhere in the js.erb
+ #assert_select '.welcome-message h2', _('Comment was successfully created.')
+ assert_equal 'Test Note', Note.last.text, 'Expected the note to have been created'
+
+ # No Answer
+ post notes_path, {new_note: {user_id: @user.id, plan_id: @plan.id, question_id: @question.id,
+ "#{@question.id}new_note_text": 'Test Note no Answer'}}, {'ACCEPT': 'text/javascript'}
+ assert_response :success
+ assert assigns(:note)
+ assert assigns(:plan)
+ assert assigns(:answer)
+ assert assigns(:question)
+ assert assigns(:notice)
+ assert assigns(:num_notes)
+# TODO: We don't appear to be displaying the success/failure notice anywhere in the js.erb
+ #assert_select '.welcome-message h2', _('Comment was successfully created.')
+# TODO: expected the new note to have been added :/
+ #assert_equal 'Test Note no Answer', Note.last.text, 'Expected the note to have been created even if there was no answer'
+
+ # Invalid object
+ post notes_path, {new_note: {user_id: @user.id, answer_id: @answer.id, plan_id: @plan.id,
+ question_id: @question.id}}, {'ACCEPT': 'text/javascript'}
+ assert_response :success
+ assert assigns(:note)
+ assert assigns(:plan)
+ assert assigns(:answer)
+ assert assigns(:question)
+ assert assigns(:notice)
+ assert assigns(:num_notes)
+# TODO: We don't appear to be displaying the success/failure notice anywhere in the js.erb
+ #assert_select '.welcome-message h2', _('Unable to save your changes.')
+ end
+
+ # PUT /notes/:id (note_path)
+ # ----------------------------------------------------------
+ test "update the note" do
+ # Should redirect user to the root path if they are not logged in!
+ put note_path(@note), {note: {id: @note.id}, "#{@question.id}new_note_text": 'Test Note'}, {'ACCEPT': 'text/javascript'}
+ assert_unauthorized_redirect_to_root_path
+
+ sign_in @user
+
+ # Valid save
+ put note_path(@note), {note: {id: @note.id}, "#{@question.id}new_note_text": 'Test Note'}, {'ACCEPT': 'text/javascript'}
+ assert_response :success
+ assert assigns(:note)
+ assert assigns(:plan)
+ assert assigns(:answer)
+ assert assigns(:question)
+ assert assigns(:notice)
+# TODO: We don't appear to be displaying the success/failure notice anywhere in the js.erb
+ #assert_select '.welcome-message h2', _('Comment was successfully created.')
+ @note.reload
+ assert_equal 'Test Note', @note.text, "expected the note's text to be 'Test Note'"
+
+ # Invalid save
+ put note_path(@note), {note: {id: @note.id}, "#{@question.id}new_note_text": nil}, {'ACCEPT': 'text/javascript'}
+ assert_response :success
+ assert assigns(:note)
+ assert assigns(:plan)
+ assert assigns(:answer)
+ assert assigns(:question)
+ assert assigns(:notice)
+# TODO: We don't appear to be displaying the success/failure notice anywhere in the js.erb
+ #assert_select '.welcome-message h2', _('Unable to save your changes.')
+ assert_equal 'Test Note', @note.text, "expected the note's text to Still be 'Test Note'"
+ end
+
+ # PATCH /notes/:id/archive (archive_note_path)
+ # ----------------------------------------------------------
+ test "delete the note" do
+ # Should redirect user to the root path if they are not logged in!
+ patch archive_note_path(@note), {note: {id: @note.id, archived_by: @user.id}}, {'ACCEPT': 'text/javascript'}
+ assert_unauthorized_redirect_to_root_path
+
+ sign_in @user
+
+ patch archive_note_path(@note), {note: {id: @note.id, archived_by: @user.id}}, {'ACCEPT': 'text/javascript'}
+ assert_response :success
+ assert assigns(:note)
+ assert assigns(:plan)
+ assert assigns(:answer)
+ assert assigns(:question)
+ assert assigns(:notice)
+
+ @note.reload
+ assert @note.archived, 'expected the archived flag to be true'
+ assert_equal @user.id, @note.archived_by, 'expected the archived_by to be set to @user'
+ end
+end
\ No newline at end of file
diff --git a/test/functional/organisations_controller_test.rb b/test/functional/organisations_controller_test.rb
deleted file mode 100644
index 9518993..0000000
--- a/test/functional/organisations_controller_test.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-require 'test_helper'
-
-class OrganisationsControllerTest < ActionController::TestCase
-=begin
- setup do
- @organisation = organisations(:one)
- end
-
- test "should get index" do
- get :index
- assert_response :success
- assert_not_nil assigns(:organisations)
- end
-
- test "should get new" do
- get :new
- assert_response :success
- end
-
- test "should create organisation" do
- assert_difference('Org.count') do
- post :create, organisation: { abbreviation: @organisation.abbreviation, banner_file_id: @organisation.banner_file_id, description: @organisation.description, domain: @organisation.domain, logo_file_id: @organisation.logo_file_id, name: @organisation.name, stylesheet_file_id: @organisation.stylesheet_file_id, target_url: @organisation.target_url, type_id: @organisation.type_id, wayfless_entite: @organisation.wayfless_entite }
- end
-
- assert_redirected_to organisation_path(assigns(:organisation))
- end
-
- test "should show organisation" do
- get :show, id: @organisation
- assert_response :success
- end
-
- test "should get edit" do
- get :edit, id: @organisation
- assert_response :success
- end
-
- test "should update organisation" do
- put :update, id: @organisation, organisation: { abbreviation: @organisation.abbreviation, banner_file_id: @organisation.banner_file_id, description: @organisation.description, domain: @organisation.domain, logo_file_id: @organisation.logo_file_id, name: @organisation.name, stylesheet_file_id: @organisation.stylesheet_file_id, target_url: @organisation.target_url, type_id: @organisation.type_id, wayfless_entite: @organisation.wayfless_entite }
- assert_redirected_to organisation_path(assigns(:organisation))
- end
-
- test "should destroy organisation" do
- assert_difference('Org.count', -1) do
- delete :destroy, id: @organisation
- end
-
- assert_redirected_to organisations_path
- end
-=end
-end
diff --git a/test/functional/orgs_controller_test.rb b/test/functional/orgs_controller_test.rb
new file mode 100644
index 0000000..803be47
--- /dev/null
+++ b/test/functional/orgs_controller_test.rb
@@ -0,0 +1,85 @@
+require 'test_helper'
+
+class OrgsControllerTest < ActionDispatch::IntegrationTest
+
+ include Devise::Test::IntegrationHelpers
+
+ # TODO: The following methods SHOULD replace the old 'admin_' prefixed methods. The children_org and templates_org
+ # routes don't even have an endpoint defined in the controller!
+ #
+ # SHOULD BE:
+ # --------------------------------------------------
+ # orgs GET /orgs orgs#index
+ # POST /orgs orgs#create
+ # org GET /orgs/:id orgs#show
+ # PATCH /orgs/:id orgs#update
+ # PUT /orgs/:id orgs#update
+ # DELETE /orgs/:id orgs#destroy
+ #
+ # CURRENT RESULTS OF `rake routes`
+ # --------------------------------------------------
+ # children_org GET /org/admin/:id/children orgs#children
+ # templates_org GET /org/admin/:id/templates orgs#templates
+ # admin_show_org GET /org/admin/:id/admin_show orgs#admin_show
+ # admin_edit_org GET /org/admin/:id/admin_edit orgs#admin_edit
+ # admin_update_org PUT /org/admin/:id/admin_update orgs#admin_update
+
+ setup do
+ @org = Org.first
+ scaffold_org_admin(@org)
+ end
+
+ # GET /org/admin/:id/admin_show (admin_show_org_path)
+ # ----------------------------------------------------------
+ test 'show the org' do
+ # Should redirect user to the root path if they are not logged in!
+ get admin_show_org_path(@org)
+ assert_unauthorized_redirect_to_root_path
+
+ sign_in @user
+
+ get admin_show_org_path(@org)
+ assert_response :success
+ assert assigns(:org)
+ end
+
+ # GET /org/admin/:id/admin_edit (admin_edit_org_path)
+ # ----------------------------------------------------------
+ test 'load the edit org page' do
+ # Should redirect user to the root path if they are not logged in!
+ get admin_edit_org_path(@org)
+ assert_unauthorized_redirect_to_root_path
+
+ sign_in @user
+
+ get admin_edit_org_path(@org)
+ assert_response :success
+ assert assigns(:org)
+ assert assigns(:languages)
+ end
+
+ # PUT /org/admin/:id/admin_update (admin_update_org_path)
+ # ----------------------------------------------------------
+ test 'update the org' do
+ params = {name: 'Testing UPDATE'}
+
+ # Should redirect user to the root path if they are not logged in!
+ put admin_update_org_path(@org), {org: params}
+ assert_unauthorized_redirect_to_root_path
+
+ sign_in @user
+
+ put admin_update_org_path(@org), {org: params}
+ assert_equal _('Organisation was successfully updated.'), flash[:notice]
+ assert_response :redirect
+ assert_redirected_to admin_show_org_path(@org)
+ assert assigns(:org)
+ assert_equal 'Testing UPDATE', @org.reload.name, "expected the record to have been updated"
+
+ # Invalid object
+ put admin_update_org_path(@org), {org: {name: nil}}
+ assert flash[:notice].starts_with?(_('Could not update your'))
+ assert_response :success
+ assert assigns(:org)
+ end
+end
diff --git a/test/functional/phases_controller_test.rb b/test/functional/phases_controller_test.rb
new file mode 100644
index 0000000..38946a7
--- /dev/null
+++ b/test/functional/phases_controller_test.rb
@@ -0,0 +1,216 @@
+require 'test_helper'
+
+class PhasesControllerTest < ActionDispatch::IntegrationTest
+
+ include Devise::Test::IntegrationHelpers
+
+ setup do
+ scaffold_template
+
+ # Get the first Org Admin
+ scaffold_org_admin(@template.org)
+
+ @plan = Plan.create!(template: @template, title: 'Test Plan',
+ roles: [Role.new(user: @user, creator: true)])
+ end
+
+# TODO: The following methods SHOULD replace the old 'admin_' prefixed methods. The routes file already has
+# these defined. They are defined multiple times though and we need to clean this up! In particular
+# look at the unnamed routes after 'new_plan_phase' below. They are not named because they are duplicates.
+# We should just have:
+#
+# SHOULD BE:
+# --------------------------------------------------
+# phases GET /templates/:template_id/phases phases#index
+# POST /templates/:template_id/phases phases#create
+# phase GET /templates/:template_id/phase/:id phases#show
+# PATCH /templates/:template_id/phase/:id phases#update
+# PUT /templates/:template_id/phase/:id phases#update
+# DELETE /templates/:template_id/phase/:id phases#destroy
+# edit_phase GET /templates/:template_id/phase/:id/edit phases#edit
+# new_phase GET /templates/:template_id/phase/new phases#new
+#
+# CURRENT RESULTS OF `rake routes`
+# --------------------------------------------------
+# admin_show_phase GET /org/admin/templates/phases/:id/admin_show(.:format) phases#admin_show
+# admin_preview_phase GET /org/admin/templates/phases/:id/admin_preview(.:format) phases#admin_preview
+# admin_add_phase GET /org/admin/templates/phases/:id/admin_add(.:format) phases#admin_add
+# admin_update_phase PUT /org/admin/templates/phases/:id/admin_update(.:format) phases#admin_update
+# admin_create_phase POST /org/admin/templates/phases/:id/admin_create(.:format) phases#admin_create
+# admin_destroy_phase DELETE /org/admin/templates/phases/:id/admin_destroy(.:format) phases#admin_destroy
+#
+# edit_plan_phase GET /plans/:plan_id/phases/:id/edit(.:format) phases#edit
+# status_plan_phase GET /plans/:plan_id/phases/:id/status(.:format) phases#status
+# plan_phase POST /plans/:plan_id/phases/:id/update(.:format) phases#update
+# plan_phases GET /plans/:plan_id/phases(.:format) phases#index
+# POST /plans/:plan_id/phases(.:format) phases#create
+# new_plan_phase GET /plans/:plan_id/phases/new(.:format) phases#new
+# GET /plans/:plan_id/phases/:id/edit(.:format) phases#edit
+# GET /plans/:plan_id/phases/:id(.:format) phases#show
+# PATCH /plans/:plan_id/phases/:id(.:format) phases#update
+# PUT /plans/:plan_id/phases/:id(.:format) phases#update
+# DELETE /plans/:plan_id/phases/:id(.:format) phases#destroy
+
+
+
+ # GET /plans/:plan_id/phases/:id/edit (edit_plan_phase_path)
+ # ----------------------------------------------------------
+ test "show the edit phase page" do
+ # Should redirect user to the root path if they are not logged in!
+ get edit_plan_phase_path(@plan, @template.phases.first)
+ assert_unauthorized_redirect_to_root_path
+
+ sign_in @user
+
+ # TODO: Why does the policy check fail when @user is the creator and owner of @plan!?
+ # Trying `@plan.assign_editor(@user)` doesn't work either!
+ #get edit_plan_phase_path(@plan, @template.phases.first)
+ #assert_response :success
+
+ #assert assigns(:plan)
+ #assert assigns(:phase)
+ #assert assigns(:question_guidance)
+ end
+
+ # GET /plans/:plan_id/phases/:id/status (status_plan_phase_path)
+ # ----------------------------------------------------------
+ test "get the phase's status" do
+ # Should redirect user to the root path if they are not logged in!
+ get status_plan_phase_path(plan_id: @plan.id, id: @template.phases.first.id)
+ assert_unauthorized_redirect_to_root_path
+
+ sign_in @user
+
+ get status_plan_phase_path(@plan, @template.phases.first), format: :json
+ assert_response :success
+
+ assert assigns(:plan)
+ end
+
+# TODO: Why are we passing an :id here!? Its a new record but we seem to need the last template's id
+ # GET /org/admin/templates/phases/:id/admin_show (admin_show_phase_path)
+ # ----------------------------------------------------------
+ test "show the phase" do
+ # Should redirect user to the root path if they are not logged in!
+ get admin_show_phase_path(@template.phases.first)
+ assert_unauthorized_redirect_to_root_path
+
+ sign_in @user
+
+ get admin_show_phase_path(@template.phases.first)
+ assert_response :success
+
+ assert assigns(:phase)
+ assert assigns(:edit)
+ assert assigns(:sections)
+ end
+
+ # GET /org/admin/templates/phases/:id/admin_preview (admin_preview_phase_path)
+ # ----------------------------------------------------------
+ test "preview the phase" do
+ # Should redirect user to the root path if they are not logged in!
+ get admin_preview_phase_path(@template.phases.first)
+ assert_unauthorized_redirect_to_root_path
+
+ sign_in @user
+
+ get admin_preview_phase_path(@template.phases.first)
+ assert_response :success
+
+ assert assigns(:template)
+ assert assigns(:phase)
+ end
+
+ # GET /org/admin/templates/phases/:id/admin_add (admin_add_phase) Why do we have an id here!?
+ # ----------------------------------------------------------
+ test "show the new phase page" do
+ # Should redirect user to the root path if they are not logged in!
+ get admin_add_phase_path(@template.phases.first)
+ assert_unauthorized_redirect_to_root_path
+
+ sign_in @user
+
+ get admin_add_phase_path(@template.phases.first)
+ assert_response :success
+
+ assert assigns(:template)
+ assert assigns(:phase)
+ end
+
+# TODO: Why are we passing an :id here!? Its a new record but we seem to need the last template's id
+ # POST /org/admin/templates/phases/:id/admin_create (admin_create_phase_path)
+ # ----------------------------------------------------------
+ test "create a phase " do
+ params = {template_id: @template.id, title: 'Phase: Tester 2', number: 2}
+
+ # Should redirect user to the root path if they are not logged in!
+ post admin_create_phase_path(@template.phases.first), {phase: params}
+ assert_unauthorized_redirect_to_root_path
+
+ sign_in @user
+
+ post admin_create_phase_path(@template.phases.first), {phase: params}
+ assert_equal _('Information was successfully created.'), flash[:notice]
+ assert_response :redirect
+ assert_redirected_to admin_show_phase_path(id: Phase.last.id, edit: 'true')
+ assert assigns(:phase)
+ assert_equal 'Phase: Tester 2', Phase.last.title, "expected the record to have been created!"
+
+ # Invalid object
+ post admin_create_phase_path(@template.phases.first), {phase: {template_id: @template.id}}
+ assert flash[:notice].starts_with?(_('Could not create your'))
+ assert_response :success
+ assert assigns(:phase)
+ assert assigns(:template)
+ end
+
+ # PUT /org/admin/templates/phases/:id/admin_update (admin_update_phase_path)
+ # ----------------------------------------------------------
+ test "update the phase" do
+ params = {title: 'Phase - UPDATE'}
+
+ # Should redirect user to the root path if they are not logged in!
+ put admin_update_phase_path(@template.phases.first), {phase: params}
+ assert_unauthorized_redirect_to_root_path
+
+ sign_in @user
+
+ # Valid save
+ put admin_update_phase_path(@template.phases.first), {phase: params}
+ assert_equal _('Information was successfully updated.'), flash[:notice]
+ assert_response :redirect
+ assert_redirected_to admin_show_phase_url(@template.phases.first)
+ assert assigns(:phase)
+ assert_equal 'Phase - UPDATE', @template.phases.first.title, "expected the record to have been updated"
+
+ # Invalid save
+ put admin_update_phase_path(@template.phases.first), {phase: {title: nil}}
+ assert flash[:notice].starts_with?(_('Could not update your'))
+ assert_response :success
+ assert assigns(:phase)
+ assert assigns(:template)
+ assert assigns(:sections)
+ assert assigns(:edit)
+ end
+
+ # DELETE /org/admin/templates/phases/:id/admin_destroy (admin_destroy_phase_path)
+ # ----------------------------------------------------------
+ test "delete the phase" do
+ id = @template.phases.first.id
+ # Should redirect user to the root path if they are not logged in!
+ # TODO: Why are we not just using id: here? shouldn't need to specify the key
+ delete admin_destroy_phase_path(id: @template.phases.first.id, phase_id: id)
+ assert_unauthorized_redirect_to_root_path
+
+ sign_in @user
+
+ delete admin_destroy_phase_path(id: @template.phases.first.id, phase_id: id)
+ assert_response :redirect
+ assert_redirected_to admin_template_template_url
+ assert_equal _('Information was successfully deleted.'), flash[:notice]
+ assert_raise ActiveRecord::RecordNotFound do
+ Phase.find(id).nil?
+ end
+ end
+
+end
\ No newline at end of file
diff --git a/test/functional/plans_controller_test.rb b/test/functional/plans_controller_test.rb
new file mode 100644
index 0000000..2bfcf9e
--- /dev/null
+++ b/test/functional/plans_controller_test.rb
@@ -0,0 +1,281 @@
+require 'test_helper'
+
+class PlansControllerTest < ActionDispatch::IntegrationTest
+
+ include Devise::Test::IntegrationHelpers
+
+ # TODO: Cleanup these routes! There are duplicates and ones no longer in use!
+ #
+ # CURRENT RESULTS OF `rake routes`
+ # --------------------------------------------------
+ # status_plan GET /plans/:id/status plans#status
+ # locked_plan GET /plans/:id/locked plans#locked
+ # answer_plan GET /plans/:id/answer plans#answer
+ # update_guidance_choices_plan PUT /plans/:id/update_guidance_choices plans#update_guidance_choices
+ # delete_recent_locks_plan POST /plans/:id/delete_recent_locks plans#delete_recent_locks
+ # lock_section_plan POST /plans/:id/lock_section plans#lock_section
+ # unlock_section_plan POST /plans/:id/unlock_section plans#unlock_section
+ # unlock_all_sections_plan POST /plans/:id/unlock_all_sections plans#unlock_all_sections
+ # export_plan GET /plans/:id/export plans#export
+ # warning_plan GET /plans/:id/warning plans#warning
+ # section_answers_plan GET /plans/:id/section_answers plans#section_answers
+ # share_plan GET /plans/:id/share plans#share
+ # GET /plans/:id/export plans#export
+ # invite_plan POST /plans/:id/invite plans#invite
+ # possible_templates_plans GET /plans/possible_templates plans#possible_templates
+ # possible_guidance_plans GET /plans/possible_guidance plans#possible_guidance
+
+ # plans GET /plans plans#index
+ # POST /plans plans#create
+ # new_plan GET /plans/new plans#new
+ # edit_plan GET /plans/:id/edit plans#edit
+ # plan GET /plans/:id plans#show
+ # PATCH /plans/:id plans#update
+ # PUT /plans/:id plans#update
+ # DELETE /plans/:id plans#destroy
+
+ setup do
+ @org = Org.first
+ scaffold_plan
+ @user = @plan.owner
+
+ # This should NOT be unnecessary! Owner should have full access
+ role = Role.where(user: @user, plan: @plan).first
+ role.access = 15
+ role.save!
+ end
+
+ # GET /plans (plans_path)
+ # ----------------------------------------------------------
+ test 'load the list of plans page' do
+ # Should redirect user to the root path if they are not logged in!
+ get plans_path
+ assert_unauthorized_redirect_to_root_path
+
+ sign_in @user
+
+ get plans_path
+ assert_response :success
+ assert assigns(:plans)
+ end
+
+ # GET /plans/new (new_plan_path)
+ # ----------------------------------------------------------
+ test 'load the new plan page' do
+ # Should redirect user to the root path if they are not logged in!
+ get new_plan_path
+ assert_unauthorized_redirect_to_root_path
+
+ sign_in @user
+
+ get new_plan_path
+ assert_response :success
+ assert assigns(:plan)
+ assert assigns(:funders)
+ end
+
+ # POST /plans (plans_path)
+ # ----------------------------------------------------------
+ test "create a new plan" do
+ params = {template_id: @template.id}
+ # Should redirect user to the root path if they are not logged in!
+ post plans_path, params
+ assert_unauthorized_redirect_to_root_path
+
+ sign_in @user
+
+ post plans_path, params
+ assert_equal _('Plan was successfully created.'), flash[:notice]
+ assert_response :redirect
+ assert_redirected_to "#{plan_url(Plan.last)}?editing=true"
+ assert assigns(:plan)
+ assert_equal "#{_('My plan')} (#{@template.title})", Plan.last.title, "expected the record to have been created"
+
+# TODO: We should also test the various template routes: funder, institution, generic
+
+# TODO: Reactivate this once the validations on the model are in place!
+ # Invalid object
+# post plans_path, {plan: {title: nil, template: @template}}
+# assert flash[:notice].starts_with?(_('Could not create your'))
+# assert_response :success
+# assert assigns(:plan)
+ end
+
+ # GET /plan/:id (plan_path)
+ # ----------------------------------------------------------
+ test 'show the plan page' do
+ # Should redirect user to the root path if they are not logged in!
+ try_no_user_and_unauthorized(plan_path(@plan))
+
+ sign_in @user
+ get plan_path(@plan)
+ assert_response :success
+ assert assigns(:plan)
+ assert_not assigns(:editing)
+ assert assigns(:selected_guidance_groups)
+ end
+
+ # GET /plan/:id/edit (edit_plan_path)
+ # ----------------------------------------------------------
+ test 'show the edit plan page' do
+ # Should redirect user to the root path if they are not logged in!
+ try_no_user_and_unauthorized(edit_plan_path(@plan))
+
+ sign_in @user
+ get edit_plan_path(@plan)
+ assert_response :success
+ assert assigns(:plan)
+ assert assigns(:phase)
+ assert assigns(:readonly)
+ end
+
+ # PUT /plan/:id (plan_path)
+ # ----------------------------------------------------------
+ test 'update the plan' do
+ params = {title: 'Testing UPDATE'}
+ # Should redirect user to the root path if they are not logged in!
+ put plan_path(@plan), {plan: params}
+ assert_unauthorized_redirect_to_root_path
+
+ # User who is does not have access to the plan
+ sign_in User.first
+ put plan_path(@plan), {plan: params}
+ assert_equal _('You are not authorized to perform this action.'), flash[:notice]
+ assert_response :redirect
+ assert_redirected_to plans_url
+
+ sign_in @user
+
+ put plan_path(@plan), {plan: params}
+ assert_equal _('Plan was successfully updated.'), flash[:notice]
+ assert_response :redirect
+ assert_redirected_to plan_url(@plan)
+ assert assigns(:plan)
+ assert_equal 'Testing UPDATE', @plan.reload.title, "expected the record to have been updated"
+
+# TODO: Reactivate this once the validations on the model are in place!
+ # Invalid object
+# put plan_path(@plan), {plan: {title: nil}}
+# assert flash[:notice].starts_with?(_('Could not update your'))
+# assert_response :success
+# assert assigns(:plan)
+ end
+
+ # DELETE /plan/:id (plan_path)
+ # ----------------------------------------------------------
+ test "delete the plan" do
+ id = @plan.id
+ # Should redirect user to the root path if they are not logged in!
+ delete plan_path(@plan)
+ assert_unauthorized_redirect_to_root_path
+
+ # User who is does not have access to the plan
+ sign_in User.first
+ delete plan_path(@plan)
+ assert_equal _('You are not authorized to perform this action.'), flash[:notice]
+ assert_response :redirect
+ assert_redirected_to plans_url
+
+ sign_in @user
+ delete plan_path(@plan)
+ assert_equal _('Plan was successfully deleted.'), flash[:notice]
+ assert_response :redirect
+ assert assigns(:plan)
+ assert_redirected_to plans_path
+ assert_raise ActiveRecord::RecordNotFound do
+ Plan.find(id).nil?
+ end
+ end
+
+ # PUT /plans/:id/update_guidance_choices (update_guidance_choices_plan_path)
+ # ----------------------------------------------------------
+ test "update the selected guidance" do
+ params = {plan_guidance_group_ids: [GuidanceGroup.first.id, GuidanceGroup.last.id]}
+
+ put update_guidance_choices_plan_path(@plan, format: :json), {plan: params}
+ assert_unauthorized_redirect_to_root_path
+
+ # User who is does not have access to the plan
+ sign_in User.first
+ put update_guidance_choices_plan_path(@plan, format: :json), {plan: params}
+ assert_equal _('You are not authorized to perform this action.'), flash[:notice]
+ assert_response :redirect
+ assert_redirected_to plans_url
+
+ sign_in @user
+ put update_guidance_choices_plan_path(@plan, format: :json), {plan: params}
+ assert_response :success
+
+# TODO: The plan_guidance_groups array is always empty so this method isn't actually doing anything yet
+# is it old code that is no longer used or is there a problem with implementation? Should we be
+# auto-populating it on plan creation?
+ #assert @plan.plan_guidance_groups.include?(GuidanceGroup.first), "expected the plan to have the first GuidanceGroup selected"
+ #assert @plan.plan_guidance_groups.include?(GuidanceGroup.last), "expected the plan to have the last GuidanceGroup selected"
+ end
+
+ # GET /plans/:id/share (share_plan_path)
+ # ----------------------------------------------------------
+ test "get the share plan page" do
+ # Should redirect user to the root path if they are not logged in!
+ try_no_user_and_unauthorized(share_plan_path(@plan))
+
+ sign_in @user
+ get share_plan_path(@plan)
+ assert_response :success
+ assert assigns(:plan)
+ assert assigns(:plan_data)
+ end
+
+ # GET /plans/:id/status(format: :json) (status_plan_path)
+ # ----------------------------------------------------------
+ test "get the plan status" do
+ # Should redirect user to the root path if they are not logged in!
+ try_no_user_and_unauthorized(status_plan_path(@plan, format: :json))
+
+ sign_in @user
+ get status_plan_path(@plan, format: :json)
+ assert_response :success
+ assert assigns(:plan)
+ end
+
+ # GET /plans/:id/answer(format: :json) (answer_plan_path)
+ # ----------------------------------------------------------
+ test "get the answer to the specified question for the plan" do
+ # Should redirect user to the root path if they are not logged in!
+ try_no_user_and_unauthorized(answer_plan_path(@plan, format: :json))
+
+ sign_in @user
+ get answer_plan_path(@plan, format: :json)
+ assert_response :success
+ assert assigns(:plan)
+ end
+
+ # GET /plans/:id/export (export_plan_path)
+ # ----------------------------------------------------------
+ test "export the plan" do
+ # Should redirect user to the root path if they are not logged in!
+ try_no_user_and_unauthorized(export_plan_path(@plan))
+
+ sign_in @user
+ get export_plan_path(@plan)
+ assert_response :success
+ assert assigns(:plan)
+
+ # TODO: We need some better tests here to check the different formats!
+ end
+
+ private
+ def try_no_user_and_unauthorized(target)
+ # Should redirect user to the root path if they are not logged in!
+ get target
+ assert_unauthorized_redirect_to_root_path
+
+ # User who is does not have access to the plan
+ sign_in User.first
+ get target
+ assert_equal _('You are not authorized to perform this action.'), flash[:notice]
+ assert_response :redirect
+ assert_redirected_to plans_url
+ end
+
+end
diff --git a/test/functional/questions_controller_test.rb b/test/functional/questions_controller_test.rb
new file mode 100644
index 0000000..68f2034
--- /dev/null
+++ b/test/functional/questions_controller_test.rb
@@ -0,0 +1,126 @@
+require 'test_helper'
+
+class QuestionsControllerTest < ActionDispatch::IntegrationTest
+
+ include Devise::Test::IntegrationHelpers
+
+ setup do
+ scaffold_template
+ @section = @template.phases.first.sections.first
+
+ # Get the first Org Admin
+ scaffold_org_admin(@template.org)
+
+ @question_format = QuestionFormat.where(option_based: false).first
+ end
+
+# TODO: The following methods SHOULD replace the old 'admin_' prefixed methods. The routes file already has
+# these defined. They are defined multiple times though and we need to clean this up! In particular
+# look at the unnamed routes after 'new_plan_phase' below. They are not named because they are duplicates.
+# We should just have:
+#
+# SHOULD BE:
+# --------------------------------------------------
+# questions GET /templates/:template_id/phases/:phase_id/sections/:section_id/questions sections#index
+# POST /templates/:template_id/phases/:phase_id/sections/:section_id/questions sections#create
+# question GET /templates/:template_id/phases/:phase_id/section/:section_id/questions/:id sections#show
+# PATCH /templates/:template_id/phases/:phase_id/section/:section_id/questions/:id sections#update
+# PUT /templates/:template_id/phases/:phase_id/section/:section_id/questions/:id sections#update
+# DELETE /templates/:template_id/phases/:phase_id/section/:section_id/questions/:id sections#destroy
+#
+# CURRENT RESULTS OF `rake routes`
+# --------------------------------------------------
+# admin_create_question POST /org/admin/templates/questions/:id/admin_create questions#admin_create
+# admin_update_question PUT /org/admin/templates/questions/:id/admin_update questions#admin_update
+# admin_destroy_question DELETE /org/admin/templates/questions/:id/admin_destroy questions#admin_destroy
+
+
+ # POST /org/admin/templates/questions/:id/admin_create (admin_create_question_path)
+ # ----------------------------------------------------------
+ test "create a new question" do
+ params = {section_id: @section.id, text: 'Test Question', number: 9, question_format_id: @question_format.id}
+
+ # Should redirect user to the root path if they are not logged in!
+ post admin_create_question_path(@section), {question: params}
+ assert_unauthorized_redirect_to_root_path
+
+ sign_in @user
+
+ post admin_create_question_path(@section), {question: params}
+ assert_response :redirect
+ assert assigns(:question)
+ assert_redirected_to admin_show_phase_url(id: @section.phase.id, edit: 'true', section_id: @section.id, question_id: Question.last.id)
+ assert_equal _('Information was successfully created.'), flash[:notice]
+ assert_equal 'Test Question', Question.last.text, "expected the record to have been created!"
+
+ # Invalid object
+ post admin_create_question_path(@section), {question: {section_id: @section.id, text: nil}}
+ assert flash[:notice].starts_with?(_('Could not create your'))
+ assert_response :success
+ assert assigns(:question)
+ assert assigns(:section)
+ assert assigns(:phase)
+ assert assigns(:edit)
+ assert assigns(:open)
+ assert assigns(:sections)
+ assert assigns(:section_id)
+ end
+
+ # PUT /org/admin/templates/questions/:id/admin_update (admin_update_question_path)
+ # ----------------------------------------------------------
+ test "update the question" do
+ params = {text: 'Question - UPDATE'}
+
+ # Should redirect user to the root path if they are not logged in!
+ put admin_update_question_path(@section.questions.first), {question: params}
+ assert_unauthorized_redirect_to_root_path
+
+ sign_in @user
+
+ # Valid save
+ put admin_update_question_path(@section.questions.first), {question: params}
+ assert_equal _('Information was successfully updated.'), flash[:notice]
+ assert_response :redirect
+ assert_redirected_to admin_show_phase_url(id: @section.phase.id, edit: 'true', section_id: @section.id, question_id: @section.questions.first.id)
+ assert assigns(:phase)
+ assert assigns(:section)
+ assert assigns(:question)
+ assert_equal 'Question - UPDATE', @section.questions.first.text, "expected the record to have been updated"
+
+ # Invalid save
+ put admin_update_question_path(@section.questions.first), {question: {text: nil}}
+ assert flash[:notice].starts_with?(_('Could not update your'))
+ assert_response :success
+ assert assigns(:question)
+ assert assigns(:section)
+ assert assigns(:phase)
+ assert assigns(:edit)
+ assert assigns(:open)
+ assert assigns(:sections)
+ assert assigns(:section_id)
+ assert assigns(:question_id)
+ end
+
+ # DELETE /org/admin/templates/questions/:id/admin_destroy (admin_destroy_question_path)
+ # ----------------------------------------------------------
+ test "delete the question" do
+ id = @section.questions.first.id
+ # Should redirect user to the root path if they are not logged in!
+ delete admin_destroy_question_path(id: @section.id, question_id: id)
+ assert_unauthorized_redirect_to_root_path
+
+ sign_in @user
+
+ delete admin_destroy_question_path(id: @section.id, question_id: id)
+ assert_response :redirect
+ assert assigns(:phase)
+ assert assigns(:section)
+ assert assigns(:question)
+ assert_redirected_to admin_show_phase_url(id: @section.phase.id, edit: 'true', section_id: @section.id)
+ assert_equal _('Information was successfully deleted.'), flash[:notice]
+ assert_raise ActiveRecord::RecordNotFound do
+ Question.find(id).nil?
+ end
+ end
+
+end
\ No newline at end of file
diff --git a/test/functional/registrations_controller_test.rb b/test/functional/registrations_controller_test.rb
index d7f714d..7d5c02a 100644
--- a/test/functional/registrations_controller_test.rb
+++ b/test/functional/registrations_controller_test.rb
@@ -88,11 +88,47 @@
test "user is able to edit their profile" do
sign_in @user
- put user_registration_path, {user: {firstname: 'Foo', surname: 'Bar'}}
-
+ # Change name
+ put user_registration_path, {user: {email: @user.email, firstname: 'Testing', surname: 'UPDATE'}}
+ assert_equal _('Details successfully updated.'), flash[:notice]
+ assert_response :redirect
+ assert_redirected_to edit_user_registration_url
+
+ # Change email but didn't provide password
+ put user_registration_path, {user: {email: 'something@else.org', firstname: @user.firstname, surname: @user.surname}}
assert_response :success
- assert_equal nil, flash[:notice]
- assert_select '.main_page_content h1', _('Edit profile')
+ assert_equal _('Please enter your password to change email address.'), flash[:notice]
+
+ # Change email
+ put user_registration_path, {user: {email: 'something@else.org', current_password: 'password123', firstname: @user.firstname, surname: @user.surname}}
+ assert_equal _('Details successfully updated.'), flash[:notice]
+ assert_response :redirect
+ assert_redirected_to edit_user_registration_url
+
+# TODO: These don't seem to be behaving as expected. There were several typos in the controller that have been fixed
+# (succesfully_updated vs successfully_updated)
+=begin
+ # Change password but neglected to provide the password
+ put user_registration_path, {user: {password_confirmation: 'testing123', current_password: 'password123', firstname: @user.firstname, surname: @user.surname, email: @user.email}}
+ assert_response :success
+ assert flash[:notice].starts_with?(_('Unable to save your changes.'))
+
+ # Change password but neglected to provide the password confirmation
+ put user_registration_path, {user: {password: 'testing123', current_password: 'password123', firstname: @user.firstname, surname: @user.surname, email: @user.email}}
+ assert_equal _('Please enter a password confirmation'), flash[:notice]
+ assert_response :success
+
+ # Change password but the password and confirmation do not match
+ put user_registration_path, {user: {password: 'test123', password_confirmation: 'testing123', current_password: 'password123', firstname: @user.firstname, surname: @user.surname, email: @user.email}}
+ assert_equal _('Password and comfirmation must match'), flash[:notice]
+ assert_response :success
+
+ # Change password
+ put user_registration_path, {user: {password: 'testing123', password_confirmation: 'testing123', current_password: 'password123', firstname: @user.firstname, surname: @user.surname, email: @user.email}}
+ assert flash[:notice].starts_with?(_('Could not update your'))
+ assert_response :success
+=end
+
end
# INVALID AUTH REROUTING CHECKS
diff --git a/test/functional/roles_controller_test.rb b/test/functional/roles_controller_test.rb
new file mode 100644
index 0000000..9b4eb29
--- /dev/null
+++ b/test/functional/roles_controller_test.rb
@@ -0,0 +1,101 @@
+require 'test_helper'
+
+class RolesControllerTest < ActionDispatch::IntegrationTest
+
+ include Devise::Test::IntegrationHelpers
+
+ setup do
+ scaffold_plan
+ scaffold_org_admin(@plan.template.org)
+
+ # This should NOT be unnecessary! Owner should have full access
+ Role.create(user: @user, plan: @plan, access: 15)
+
+ @invitee = User.last
+ end
+
+# TODO: Cleanup routes for this one. The controller currently only responds to create, update, destroy
+
+# CURRENT RESULTS OF `rake routes`
+# --------------------------------------------------
+# roles POST /roles roles#create
+# role PATCH /roles/:id roles#update
+# PUT /roles/:id roles#update
+# DELETE /roles/:id roles#destroy
+
+# POST /roles (roles_path)
+ # ----------------------------------------------------------
+ test "create a new role" do
+ params = {plan_id: @plan.id, access_level: 4}
+
+ # Should redirect user to the root path if they are not logged in!
+ post roles_path, {role: params}
+ assert_unauthorized_redirect_to_root_path
+
+ sign_in @user
+
+ post roles_path, {user: @invitee.email, role: params}
+ assert_equal _('User added to project'), flash[:notice]
+ assert_response :redirect
+ assert_redirected_to share_plan_path(@plan)
+ assert_equal @invitee.id, Role.last.user_id, "expected the record to have been created!"
+ assert assigns(:role)
+
+ # Missing email
+ post roles_path, {role: {plan_id: @plan.id, access_level: 4}}
+ assert_equal _('Please enter an email address'), flash[:notice]
+ assert_response :redirect
+ assert_redirected_to share_plan_path(@plan)
+ assert assigns(:role)
+ end
+
+ # PUT /role/:id (role_path)
+ # ----------------------------------------------------------
+ test "update the role" do
+ role = Role.create(user: @invitee, plan: @plan, access: 1)
+ params = {access_level: 2}
+
+ # Should redirect user to the root path if they are not logged in!
+ put role_path(role), {role: params}
+ assert_unauthorized_redirect_to_root_path
+
+ sign_in @user
+
+ # Valid save
+ put role_path(role), {role: params}
+ assert_equal _('Sharing details successfully updated.'), flash[:notice]
+ assert_response :redirect
+ assert_redirected_to share_plan_path(@plan)
+ assert assigns(:role)
+ assert_equal 13, role.reload.access, "expected the record to have been updated"
+
+# TODO: Role should require a user, plan and an access level :/
+ # Invalid save
+# put role_path(role), {role: {user: nil}}
+# assert flash[:notice].starts_with?(_('Unable to save your changes.'))
+# assert_response :redirect
+# assert_redirected_to share_plan_path(@plan)
+# assert assigns(:role)
+ end
+
+ # DELETE /role/:id (role_path)
+ # ----------------------------------------------------------
+ test "delete the section" do
+ role = Role.create(user: @invitee, plan: @plan, access: 1)
+
+ # Should redirect user to the root path if they are not logged in!
+ delete role_path(role)
+ assert_unauthorized_redirect_to_root_path
+
+ sign_in @user
+
+ delete role_path(role)
+ assert_equal _('Access removed'), flash[:notice]
+ assert_response :redirect
+ assert_redirected_to share_plan_path(@plan)
+ assert_raise ActiveRecord::RecordNotFound do
+ Role.find(role.id).nil?
+ end
+ end
+
+end
\ No newline at end of file
diff --git a/test/functional/sections_controller_test.rb b/test/functional/sections_controller_test.rb
new file mode 100644
index 0000000..1338512
--- /dev/null
+++ b/test/functional/sections_controller_test.rb
@@ -0,0 +1,116 @@
+require 'test_helper'
+
+class SectionsControllerTest < ActionDispatch::IntegrationTest
+
+ include Devise::Test::IntegrationHelpers
+
+ setup do
+ scaffold_template
+ @phase = @template.phases.first
+
+ # Get the first Org Admin
+ scaffold_org_admin(@template.org)
+ end
+
+# TODO: The following methods SHOULD replace the old 'admin_' prefixed methods. The routes file already has
+# these defined. They are defined multiple times though and we need to clean this up! In particular
+# look at the unnamed routes after 'new_plan_phase' below. They are not named because they are duplicates.
+# We should just have:
+#
+# SHOULD BE:
+# --------------------------------------------------
+# sections GET /templates/:template_id/phases/:phase_id/sections sections#index
+# POST /templates/:template_id/phases/:phase_id/sections sections#create
+# section GET /templates/:template_id/phases/:phase_id/section/:id sections#show
+# PATCH /templates/:template_id/phases/:phase_id/section/:id sections#update
+# PUT /templates/:template_id/phases/:phase_id/section/:id sections#update
+# DELETE /templates/:template_id/phases/:phase_id/section/:id sections#destroy
+#
+# CURRENT RESULTS OF `rake routes`
+# --------------------------------------------------
+# admin_create_section POST /org/admin/templates/sections/:id/admin_create sections#admin_create
+# admin_update_section PUT /org/admin/templates/sections/:id/admin_update sections#admin_update
+# admin_destroy_section DELETE /org/admin/templates/sections/:id/admin_destroy sections#admin_destroy
+
+
+
+ # POST /org/admin/templates/sections/:id/admin_create (admin_create_section_path)
+ # ----------------------------------------------------------
+ test "create a new section" do
+ params = {phase_id: @phase.id, title: 'Section Tester', number: 99}
+
+ # Should redirect user to the root path if they are not logged in!
+ post admin_create_section_path(@phase), {section: params}
+ assert_unauthorized_redirect_to_root_path
+
+ sign_in @user
+
+ post admin_create_section_path(@phase), {section: params}
+ assert_response :redirect
+ assert_redirected_to admin_show_phase_url(id: @phase.id, edit: 'true', section_id: Section.last.id)
+ assert_equal _('Information was successfully created.'), flash[:notice]
+ assert_equal 'Section Tester', Section.last.title, "expected the record to have been created!"
+
+ # Invalid object
+ post admin_create_section_path(@phase), {section: {phase_id: @phase.id, title: nil}}
+ assert flash[:notice].starts_with?(_('Could not create your'))
+ assert_response :success
+ assert assigns(:section)
+ assert assigns(:phase)
+ assert assigns(:edit)
+ assert assigns(:open)
+ assert assigns(:sections)
+ end
+
+ # PUT /org/admin/templates/sections/:id/admin_update (admin_update_section_path)
+ # ----------------------------------------------------------
+ test "update the section" do
+ params = {title: 'Phase - UPDATE'}
+
+ # Should redirect user to the root path if they are not logged in!
+ put admin_update_section_path(@phase.sections.first), {section: params}
+ assert_unauthorized_redirect_to_root_path
+
+ sign_in @user
+
+ # Valid save
+ put admin_update_section_path(@phase.sections.first), {section: params}
+ assert_equal _('Information was successfully updated.'), flash[:notice]
+ assert_response :redirect
+ assert_redirected_to admin_show_phase_url(id: @phase.id, section_id: @phase.sections.first.id, edit: 'true')
+ assert_equal 'Phase - UPDATE', @phase.sections.first.title, "expected the record to have been updated"
+
+ # Invalid save
+ put admin_update_section_path(@phase.sections.first), {section: {title: nil}}
+ assert flash[:notice].starts_with?(_('Could not update your'))
+ assert_response :success
+ assert assigns(:section)
+ assert assigns(:phase)
+ assert assigns(:edit)
+ assert assigns(:open)
+ assert assigns(:sections)
+ assert assigns(:section_id)
+ end
+
+ # DELETE /org/admin/templates/sections/:id/admin_destroy (admin_destroy_section_path)
+ # ----------------------------------------------------------
+ test "delete the section" do
+ id = @phase.sections.first.id
+ # Should redirect user to the root path if they are not logged in!
+ delete admin_destroy_section_path(id: @phase.id, section_id: id)
+ assert_unauthorized_redirect_to_root_path
+
+ sign_in @user
+
+ delete admin_destroy_section_path(id: @phase.id, section_id: id)
+ assert_response :redirect
+ assert assigns(:section)
+ assert assigns(:phase)
+ assert_redirected_to admin_show_phase_url(id: @phase.id, edit: 'true' )
+ assert_equal _('Information was successfully deleted.'), flash[:notice]
+ assert_raise ActiveRecord::RecordNotFound do
+ Section.find(id).nil?
+ end
+ end
+
+end
\ No newline at end of file
diff --git a/test/functional/static_pages_controller_test.rb b/test/functional/static_pages_controller_test.rb
index d890070..a9d6df7 100644
--- a/test/functional/static_pages_controller_test.rb
+++ b/test/functional/static_pages_controller_test.rb
@@ -1,3 +1,5 @@
+require 'test_helper'
+
class StaticPagesControllerTest < ActionDispatch::IntegrationTest
include Devise::Test::IntegrationHelpers
diff --git a/test/functional/templates_controller_test.rb b/test/functional/templates_controller_test.rb
new file mode 100644
index 0000000..6e390ee
--- /dev/null
+++ b/test/functional/templates_controller_test.rb
@@ -0,0 +1,187 @@
+require 'test_helper'
+
+class TemplatesControllerTest < ActionDispatch::IntegrationTest
+
+ include Devise::Test::IntegrationHelpers
+
+ setup do
+ scaffold_template
+
+ # Get the first Org Admin
+ scaffold_org_admin(@template.org)
+ end
+
+# TODO: The following methods SHOULD replace the old 'admin_' prefixed methods. The routes file already has
+# these defined. We should remove the old routes to the 'admin_' prefixed methods as well. We should just
+# have:
+#
+# SHOULD BE:
+# --------------------------------------------------
+# templates GET /templates templates#index
+# POST /templates templates#create
+# template GET /template/[:id] templates#show
+# PATCH /template/[:id] templates#update
+# PUT /template/[:id] templates#update
+# DELETE /template/[:id] templates#destroy
+# edit_template GET /template/[:id]/edit templates#edit
+# new_template GET /templates/new templates#new
+#
+#
+# CURRENT RESULTS OF `rake routes`
+# --------------------------------------------------
+# admin_index_template GET /org/admin/templates/:id/admin_index(.:format) templates#admin_index
+# admin_template_template GET /org/admin/templates/:id/admin_template(.:format) templates#admin_template
+# admin_new_template GET /org/admin/templates/:id/admin_new(.:format) templates#admin_new
+# admin_template_history_template GET /org/admin/templates/:id/admin_template_history(.:format) templates#admin_template_history
+# admin_destroy_template DELETE /org/admin/templates/:id/admin_destroy(.:format) templates#admin_destroy
+# admin_create_template POST /org/admin/templates/:id/admin_create(.:format) templates#admin_create
+# admin_update_template PUT /org/admin/templates/:id/admin_update(.:format) templates#admin_update
+
+
+ # GET /org/admin/templates/:id/admin_index (admin_index_template_path) the :id here makes no sense!
+ # ----------------------------------------------------------
+ test "get the list of admin templates" do
+ # Should redirect user to the root path if they are not logged in!
+ get admin_index_template_path(@user.org)
+ assert_unauthorized_redirect_to_root_path
+
+ sign_in @user
+
+ get admin_index_template_path(@user.org)
+ assert_response :success
+
+ assert assigns(:templates_own)
+ assert assigns(:other_published_version)
+ assert assigns(:templates_funders)
+ assert assigns(:templates_customizations)
+ end
+
+ # GET /org/admin/templates/:id/admin_template (admin_template_template_path)
+ # ----------------------------------------------------------
+ test "get the admin template" do
+ # Should redirect user to the root path if they are not logged in!
+ get admin_template_template_path(@template)
+ assert_unauthorized_redirect_to_root_path
+
+ sign_in @user
+
+ get admin_template_template_path(@template)
+ assert_response :success
+
+ assert assigns(:template)
+ assert assigns(:hash)
+ end
+
+# TODO: Why are we passing an :id here!? Its a new record but we seem to need the last template's id
+ # GET /org/admin/templates/:id/admin_new (admin_new_template_path)
+ # ----------------------------------------------------------
+ test "get the new admin template page" do
+ # Should redirect user to the root path if they are not logged in!
+ get admin_new_template_path(Template.last.id)
+ assert_unauthorized_redirect_to_root_path
+
+ sign_in @user
+
+ get admin_new_template_path(Template.last.id)
+ assert_response :success
+ end
+
+ # GET /org/admin/templates/:id/admin_template_history (admin_template_history_template_path)
+ # ----------------------------------------------------------
+ test "get the admin template history page" do
+ # Should redirect user to the root path if they are not logged in!
+ get admin_template_history_template_path(@template)
+ assert_unauthorized_redirect_to_root_path
+
+ sign_in @user
+
+ get admin_template_history_template_path(@template)
+ assert_response :success
+
+ assert assigns(:template)
+ assert assigns(:templates)
+ end
+
+ # DELETE /org/admin/templates/:id/admin_destroy (admin_destroy_template_path)
+ # ----------------------------------------------------------
+ test "delete the admin template" do
+ id = @template.id
+ # Should redirect user to the root path if they are not logged in!
+ delete admin_destroy_template_path(@template)
+ assert_unauthorized_redirect_to_root_path
+
+ sign_in @user
+
+ delete admin_destroy_template_path(@template)
+ assert_response :redirect
+ assert_redirected_to admin_index_template_url
+ assert_raise ActiveRecord::RecordNotFound do
+ Template.find(id).nil?
+ end
+ end
+
+# TODO: Why are we passing an :id here!? Its a new record but we seem to need the last template's id
+ # POST /org/admin/templates/:id/admin_create (admin_create_template_path)
+ # ----------------------------------------------------------
+ test "create a admin template" do
+ params = {org_id: @user.org.id, version: 0, title: 'Testing create route'}
+
+ # Should redirect user to the root path if they are not logged in!
+ post admin_create_template_path(Template.last.id), {template: params}
+ assert_unauthorized_redirect_to_root_path
+
+ sign_in @user
+
+ post admin_create_template_path(Template.last.id), {template: params}
+ assert_equal _('Information was successfully created.'), flash[:notice]
+ assert_response :redirect
+ assert_redirected_to admin_template_template_url(Template.last.id)
+ assert assigns(:template)
+ assert_equal 'Testing create route', Template.last.title, "expected the record to have been created!"
+
+ # Invalid object
+ post admin_create_template_path(Template.last.id), {template: {title: nil, org_id: @user.org.id}}
+ assert flash[:notice].starts_with?(_('Could not create your'))
+ assert_response :success
+ assert assigns(:template)
+ assert assigns(:hash)
+ end
+
+ # GET /org/admin/templates/:id/admin_update (admin_update_template_path)
+ # ----------------------------------------------------------
+ test "update the admin template" do
+ params = {title: 'ABCD'}
+
+ # Should redirect user to the root path if they are not logged in!
+ put admin_update_template_path(@template), {template: params}
+ assert_unauthorized_redirect_to_root_path
+
+ sign_in @user
+
+ # Make sure we get the proper message if trying to update a published template
+ put admin_update_template_path(@template), {template: params}
+ assert_equal _('Published templates cannot be edited.'), flash[:notice]
+ assert_response :redirect
+ assert_redirected_to admin_template_template_url(Template.last.id)
+ assert assigns(:template)
+
+ @template.published = false
+ @template.save!
+
+ # Make sure we get the right response when editing an unpublished template
+ put admin_update_template_path(@template), {template: params}
+ assert_equal _('Information was successfully updated.'), flash[:notice]
+ assert_response :redirect
+ assert_redirected_to admin_template_template_url(Template.last.id)
+ assert assigns(:template)
+ assert_equal 'ABCD', @template.reload.title, "expected the record to have been updated"
+
+ # Make sure we get the right response when providing an invalid template
+ put admin_update_template_path(@template), {template: {title: nil}}
+ assert flash[:notice].starts_with?(_('Could not update your'))
+ assert_response :success
+ assert assigns(:template)
+ assert assigns(:hash)
+ end
+
+end
\ No newline at end of file
diff --git a/test/functional/users/omniauth_callbacks_controller_test.rb b/test/functional/users/omniauth_callbacks_controller_test.rb
index 924bba7..82bbfbd 100644
--- a/test/functional/users/omniauth_callbacks_controller_test.rb
+++ b/test/functional/users/omniauth_callbacks_controller_test.rb
@@ -74,7 +74,7 @@
assert_redirected_to "#{edit_user_registration_path}", "Expected a redirect to the edit profile page, #{edit_user_registration_path}, when omniauth returns with a valid identifier for a user that is already signed in!"
# reload the user record and make sure the omniauth value was attached to their record
- usr = User.find(@user)
+ usr = User.find(@user.id)
assert_equal usr.user_identifiers.find_by(identifier_scheme: scheme).identifier, 'foo:bar'
end
end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 9f72ecb..49d4e34 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -24,15 +24,20 @@
# Use the seeds.rb file to seed the test database
require_relative '../db/seeds.rb'
- # Add more helper methods to be used by all tests here...
-
-
-
- # Return the user instance variable
+ # Sometimes TravisCI fails when accessing the LANGUAGES array, so reload it here if necessary
+ LANGUAGES = Language.all if LANGUAGES.empty?
+
+ # Get the organisational admin for the Org specified or create one
# ----------------------------------------------------------------------
- def current_user
- return @user
+ def scaffold_org_admin(org)
+ @user = User.create!(email: "admin-#{org.abbreviation.downcase}@example.com", firstname: "Org", surname: "Admin",
+ language: Language.find_by(abbreviation: FastGettext.locale),
+ password: "password123", password_confirmation: "password123",
+ org: org, accept_terms: true, confirmed_at: Time.zone.now,
+ perms: Perm.where.not(name: ['admin', 'add_organisations', 'change_org_affiliation', 'grant_api_to_orgs']))
+ #perms: [Perm::GRANT_PERMISSIONS, Perm::MODIFY_TEMPLATES, Perm::MODIFY_GUIDANCE, Perm::CHANGE_ORG_DETAILS])
end
+
# Convert Ruby Class Names into attribute names (e.g. MyClass --> my_class)
# ----------------------------------------------------------------------
diff --git a/test/unit/role_test.rb b/test/unit/role_test.rb
index 3530e79..6a6b2ff 100644
--- a/test/unit/role_test.rb
+++ b/test/unit/role_test.rb
@@ -7,7 +7,7 @@
scaffold_plan
- @role = Role.create(user: User.first, plan: @plan)
+ @role = Role.create(user: User.first, plan: @plan, access: 15)
end
# ---------------------------------------------------
@@ -18,37 +18,54 @@
# Ensure the bar minimum and complete versions are valid
plan = Plan.create(title: 'Test Plan', template: Template.last)
- a = Role.new(user: @user, plan: plan)
+ a = Role.new(user: @user, plan: plan, access: 15)
assert a.valid?, "expected the 'user', 'plan' and 'access' fields to be enough to create an Role! - #{a.errors.map{|f, m| f.to_s + ' ' + m}.join(', ')}"
end
# ---------------------------------------------------
test "access is properly defaulted" do
- assert_equal 1, @role.access_level
+ assert_equal 15, @role.access
end
# ---------------------------------------------------
- test "access_level acts a proxy to the 'access' FlagShihTzu bit flag field" do
+ test "FlagShihTzu bit flag fields are properly mapped" do
assert @role.creator?, "expected the role to be creator"
@role.administrator = true
assert @role.administrator?, "expected the role to be administrator after setting 'administrator'"
@role.administrator = false
- @role.access_level = 3
- assert @role.administrator?, "expected the role to be administrator after setting 'access_level' >= 3"
+ [1, 3, 5, 7, 9, 11, 13, 15].each do |a|
+ @role.access = a
+ assert @role.creator?, "expected the role to be creator after setting 'access_level' >= #{a}"
+ end
+
+ [2, 3, 6, 7, 10, 11, 14, 15].each do |a|
+ @role.access = a
+ assert @role.administrator?, "expected the role to be administrator after setting 'access_level' >= #{a}"
+ end
+
+ [4, 5, 6, 7, 12, 13, 14, 15].each do |a|
+ @role.access = a
+ assert @role.editor?, "expected the role to be editor after setting 'access_level' >= #{a}"
+ end
+
+ [8, 9, 10, 11, 12, 13, 14, 15].each do |a|
+ @role.access = a
+ assert @role.commenter?, "expected the role to be commenter after setting 'access_level' >= #{a}"
+ end
end
# ---------------------------------------------------
test "can CRUD Role" do
plan = Plan.create(title: 'Test Plan', template: Template.last)
- obj = Role.create(user: @user, plan: plan, access_level: 1)
+ obj = Role.create(user: @user, plan: plan, access: 1)
assert_not obj.id.nil?, "was expecting to be able to create a new Role: #{obj.errors.map{|f, m| f.to_s + ' ' + m}.join(', ')}"
- obj.access_level = 2
+ obj.access = 2
obj.save!
obj.reload
- assert_equal 2, obj.access_level, "Was expecting to be able to update the text of the Role!"
+ assert_equal 2, obj.access, "Was expecting to be able to update the text of the Role!"
assert obj.destroy!, "Was unable to delete the Role!"
end
@@ -64,5 +81,5 @@
role = Role.new(user: User.first, access: 3)
verify_belongs_to_relationship(role, Plan.first)
end
-
+
end
\ No newline at end of file
diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index c0065a9..7d228d1 100644
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -193,16 +193,13 @@
# ---------------------------------------------------
test "Plans query filter is working properly" do
3.times do |i|
- @user.plans << Plan.new(template: Template.last, title: "My test #{i}",
- identifier: (i == 0 ? 'A' : (i == 1 ? 'B' : 'C')).to_s)
+ plan = Plan.create(title: "My test #{i}", template: @template, visibility: 1)
+ @user.roles << Role.new(plan: plan, access: 1)
end
@user.save!
plan = @user.plans.filter("2").first
assert_equal "My test 2", plan.title, "Expected the plans filter to search the title"
-
- plan = @user.plans.filter("B").first
- assert_equal "My test 1", plan.title, "Expected the plans filter to search the identifier fields"
end
# ---------------------------------------------------
@@ -295,9 +292,9 @@
end
# ---------------------------------------------------
- test "can manage has_many relationship with Plans" do
- plan = Plan.new(title: 'Test Project', template: @template)
- verify_has_many_relationship(@user, plan, @user.plans.count)
+ test "can manage has_many relationship with Roles" do
+ role = Role.new(plan: @plan, access: 1)
+ verify_has_many_relationship(@user, role, @user.roles.count)
end
# ---------------------------------------------------