From d07f09d2407a7455dea2e835de791a0a92fc15a4 Mon Sep 17 00:00:00 2001 From: Henare Degan Date: Thu, 16 Feb 2012 16:59:59 +1100 Subject: Add some tests for the public body home page calculation --- spec/models/public_body_spec.rb | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'spec/models') diff --git a/spec/models/public_body_spec.rb b/spec/models/public_body_spec.rb index db0de78b2..17d877b68 100644 --- a/spec/models/public_body_spec.rb +++ b/spec/models/public_body_spec.rb @@ -401,3 +401,25 @@ describe PublicBody, " when loading CSV files" do PublicBody.count.should == original_count end end + +describe PublicBody do + describe "calculated home page" do + it "should return the home page verbatim if it's present" do + public_body = PublicBody.new + public_body.home_page = "http://www.example.com" + public_body.calculated_home_page.should == "http://www.example.com" + end + + it "should return the home page based on the request email domain if it has one" do + public_body = PublicBody.new + public_body.stub!(:request_email_domain).and_return "public-authority.com" + public_body.calculated_home_page.should == "http://www.public-authority.com" + end + + it "should return nil if there's no home page and the email domain can't be worked out" do + public_body = PublicBody.new + public_body.stub!(:request_email_domain).and_return nil + public_body.calculated_home_page.should be_nil + end + end +end -- cgit v1.2.3 From 2802ab3ab3e993ee3bbf390eddd6cf356303b617 Mon Sep 17 00:00:00 2001 From: Henare Degan Date: Thu, 16 Feb 2012 17:10:09 +1100 Subject: Make public authority home page links work. Fixes #271 --- spec/models/public_body_spec.rb | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'spec/models') diff --git a/spec/models/public_body_spec.rb b/spec/models/public_body_spec.rb index 17d877b68..142735cb0 100644 --- a/spec/models/public_body_spec.rb +++ b/spec/models/public_body_spec.rb @@ -421,5 +421,11 @@ describe PublicBody do public_body.stub!(:request_email_domain).and_return nil public_body.calculated_home_page.should be_nil end + + it "should ensure home page URLs start with http://" do + public_body = PublicBody.new + public_body.home_page = "example.com" + public_body.calculated_home_page.should == "http://www.example.com" + end end end -- cgit v1.2.3 From 8a09eb837849468f291990f7d92b382a6e08ebae Mon Sep 17 00:00:00 2001 From: Henare Degan Date: Thu, 16 Feb 2012 20:38:48 +1100 Subject: Don't add extra www characters to web addresses that have been explicitly defined --- spec/models/public_body_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'spec/models') diff --git a/spec/models/public_body_spec.rb b/spec/models/public_body_spec.rb index 142735cb0..9b8c78010 100644 --- a/spec/models/public_body_spec.rb +++ b/spec/models/public_body_spec.rb @@ -425,7 +425,7 @@ describe PublicBody do it "should ensure home page URLs start with http://" do public_body = PublicBody.new public_body.home_page = "example.com" - public_body.calculated_home_page.should == "http://www.example.com" + public_body.calculated_home_page.should == "http://example.com" end end end -- cgit v1.2.3 From 0224741eb828035927995654e880f0722eea8451 Mon Sep 17 00:00:00 2001 From: Henare Degan Date: Fri, 17 Feb 2012 16:08:22 +1100 Subject: Don't add http when https is present --- spec/models/public_body_spec.rb | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'spec/models') diff --git a/spec/models/public_body_spec.rb b/spec/models/public_body_spec.rb index 9b8c78010..e30916dff 100644 --- a/spec/models/public_body_spec.rb +++ b/spec/models/public_body_spec.rb @@ -427,5 +427,11 @@ describe PublicBody do public_body.home_page = "example.com" public_body.calculated_home_page.should == "http://example.com" end + + it "should not add http when https is present" do + public_body = PublicBody.new + public_body.home_page = "https://example.com" + public_body.calculated_home_page.should == "https://example.com" + end end end -- cgit v1.2.3