From b68c23074b7849b30e8f96ea024ec14ec4b8f324 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Mon, 28 Oct 2013 11:41:43 +0000 Subject: Add a rudimentary view for an info request batch. --- .../info_request_batch_controller_spec.rb | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 spec/controllers/info_request_batch_controller_spec.rb (limited to 'spec/controllers/info_request_batch_controller_spec.rb') diff --git a/spec/controllers/info_request_batch_controller_spec.rb b/spec/controllers/info_request_batch_controller_spec.rb new file mode 100644 index 000000000..b5075c4e0 --- /dev/null +++ b/spec/controllers/info_request_batch_controller_spec.rb @@ -0,0 +1,32 @@ +# coding: utf-8 +require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') + +describe InfoRequestBatchController, "when showing a request" do + + before do + @info_request_batch = FactoryGirl.create(:info_request_batch, :title => 'Matched title', + :body => 'Matched body') + @first_request = FactoryGirl.create(:info_request, :info_request_batch => @info_request_batch) + @second_request = FactoryGirl.create(:info_request, :info_request_batch => @info_request_batch) + @default_params = {:id => @info_request_batch.id} + end + + def make_request(params=@default_params) + get :show, params + end + + it 'should be successful' do + make_request + response.should be_success + end + + it 'should assign info_requests to the view' do + make_request + assigns[:info_requests].should == [@first_request, @second_request] + end + + it 'should assign an info_request_batch to the view' do + make_request + assigns[:info_request_batch].should == @info_request_batch + end +end -- cgit v1.2.3 From dd25406c2c96eb1b59a825f866b22ee34365c06c Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Wed, 27 Nov 2013 17:55:03 +0000 Subject: Show public body list when batch has not been sent. --- .../info_request_batch_controller_spec.rb | 37 +++++++++++++++++----- 1 file changed, 29 insertions(+), 8 deletions(-) (limited to 'spec/controllers/info_request_batch_controller_spec.rb') diff --git a/spec/controllers/info_request_batch_controller_spec.rb b/spec/controllers/info_request_batch_controller_spec.rb index b5075c4e0..2a282e9a1 100644 --- a/spec/controllers/info_request_batch_controller_spec.rb +++ b/spec/controllers/info_request_batch_controller_spec.rb @@ -4,10 +4,16 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe InfoRequestBatchController, "when showing a request" do before do + @first_public_body = FactoryGirl.create(:public_body) + @second_public_body = FactoryGirl.create(:public_body) @info_request_batch = FactoryGirl.create(:info_request_batch, :title => 'Matched title', - :body => 'Matched body') - @first_request = FactoryGirl.create(:info_request, :info_request_batch => @info_request_batch) - @second_request = FactoryGirl.create(:info_request, :info_request_batch => @info_request_batch) + :body => 'Matched body', + :public_bodies => [@first_public_body, + @second_public_body]) + @first_request = FactoryGirl.create(:info_request, :info_request_batch => @info_request_batch, + :public_body => @first_public_body) + @second_request = FactoryGirl.create(:info_request, :info_request_batch => @info_request_batch, + :public_body => @second_public_body) @default_params = {:id => @info_request_batch.id} end @@ -20,13 +26,28 @@ describe InfoRequestBatchController, "when showing a request" do response.should be_success end - it 'should assign info_requests to the view' do - make_request - assigns[:info_requests].should == [@first_request, @second_request] - end - it 'should assign an info_request_batch to the view' do make_request assigns[:info_request_batch].should == @info_request_batch end + + context 'when the batch has not been sent' do + + it 'should assign public_bodies to the view' do + make_request + assigns[:public_bodies].should == [@first_public_body, @second_public_body] + end + end + + context 'when the batch has been sent' do + + it 'should assign info_requests to the view' do + @info_request_batch.sent_at = Time.now + @info_request_batch.save! + make_request + assigns[:info_requests].should == [@first_request, @second_request] + end + + end + end -- cgit v1.2.3 From c96e91cbca59b28ace56536fbc9a573f32760d5e Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Tue, 28 Jan 2014 09:47:55 +0000 Subject: Specify sort on results to return in consistent order. --- spec/controllers/info_request_batch_controller_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'spec/controllers/info_request_batch_controller_spec.rb') diff --git a/spec/controllers/info_request_batch_controller_spec.rb b/spec/controllers/info_request_batch_controller_spec.rb index 2a282e9a1..d08f02e10 100644 --- a/spec/controllers/info_request_batch_controller_spec.rb +++ b/spec/controllers/info_request_batch_controller_spec.rb @@ -45,7 +45,7 @@ describe InfoRequestBatchController, "when showing a request" do @info_request_batch.sent_at = Time.now @info_request_batch.save! make_request - assigns[:info_requests].should == [@first_request, @second_request] + assigns[:info_requests].sort.should == [@first_request, @second_request] end end -- cgit v1.2.3