Skip to content

Commit

Permalink
wth - Responses Controller find_survey Logic
Browse files Browse the repository at this point in the history
Find only surveys that are active. [#143259371]
  • Loading branch information
William Holt committed Apr 12, 2017
1 parent 2905010 commit 527cd90
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion app/controllers/surveyor/responses_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def create
private

def find_survey
surveys = Survey.where(access_code: params[:access_code]).order('version DESC')
surveys = Survey.where(access_code: params[:access_code], active: true).order('version DESC')

if params[:version]
@survey = surveys.where(version: params[:version]).first
Expand Down
20 changes: 10 additions & 10 deletions spec/controllers/surveyor/responses/get_new_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
end

it 'should assign @survey to the Survey' do
survey = create(:survey)
survey = create(:survey, active: true)

xhr :get, :new, {
access_code: survey.access_code
Expand All @@ -41,7 +41,7 @@
end

it 'should assign @response as a new Response of Survey' do
survey = create(:survey)
survey = create(:survey, active: true)

xhr :get, :new, {
access_code: survey.access_code
Expand All @@ -52,7 +52,7 @@
end

it 'should build question responses' do
survey = create(:survey)
survey = create(:survey, active: true)

xhr :get, :new, {
access_code: survey.access_code
Expand All @@ -63,7 +63,7 @@

context 'format.html (Taking Survey From Email Link)' do
it 'should assign @review to false' do
survey = create(:survey)
survey = create(:survey, active: true)
org = create(:organization)
ssr = create(:sub_service_request_without_validations, organization: org)

Expand All @@ -77,7 +77,7 @@
end

it 'should assign @sub_service_request' do
survey = create(:survey)
survey = create(:survey, active: true)
org = create(:organization)
ssr = create(:sub_service_request_without_validations, organization: org)

Expand All @@ -91,7 +91,7 @@
end

it 'should render template' do
survey = create(:survey)
survey = create(:survey, active: true)
org = create(:organization)
ssr = create(:sub_service_request_without_validations, organization: org)

Expand All @@ -105,7 +105,7 @@
end

it 'should respond ok' do
survey = create(:survey)
survey = create(:survey, active: true)
org = create(:organization)
ssr = create(:sub_service_request_without_validations, organization: org)

Expand All @@ -121,7 +121,7 @@

context 'format.js (Taking Survey From Step 4' do
it 'should assign @review to true' do
survey = create(:survey)
survey = create(:survey, active: true)

xhr :get, :new, {
access_code: survey.access_code,
Expand All @@ -132,7 +132,7 @@
end

it 'should render template' do
survey = create(:survey)
survey = create(:survey, active: true)

xhr :get, :new, {
access_code: survey.access_code,
Expand All @@ -143,7 +143,7 @@
end

it 'should respond ok' do
survey = create(:survey)
survey = create(:survey, active: true)

xhr :get, :new, {
access_code: survey.access_code,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@

context 'and system is using system satisfaction survey' do
before :each do
@survey = create(:survey, access_code: 'system-satisfaction-survey', title: 'System Satisfaction Survey')
@survey = create(:survey, access_code: 'system-satisfaction-survey', title: 'System Satisfaction Survey', active: true)

stub_const("SYSTEM_SATISFACTION_SURVEY", true)

Expand Down
2 changes: 1 addition & 1 deletion spec/features/surveyor/user_takes_survey_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
fake_login_for_each_test

before :each do
@survey = create(:survey, title: "My Survey")
@survey = create(:survey, title: "My Survey", active: true)
@section = create(:section, survey: @survey)
org = create(:organization)
@ssr = create(:sub_service_request_without_validations, organization: org)
Expand Down

0 comments on commit 527cd90

Please sign in to comment.