Skip to content

Commit 74af17b

Browse files
committed
Merge pull request #1 from github/fix-deprecations
Upgrade to Rspec 3.0
2 parents 1ffbe35 + ac5a673 commit 74af17b

File tree

3 files changed

+56
-56
lines changed

3 files changed

+56
-56
lines changed

github-pages-health-check.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
1818

1919
s.add_dependency("net-dns", "~> 0.6")
2020
s.add_dependency("public_suffix", "~> 1.4")
21-
s.add_development_dependency("rspec", "~> 2.14")
21+
s.add_development_dependency("rspec", "~> 3.0")
2222
s.add_development_dependency("pry")
2323

2424
end

spec/github-pages-health-check_spec.rb

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -14,117 +14,117 @@ def cname_packet(domain)
1414

1515
it "knows old IP addresses" do
1616
%w[204.232.175.78 207.97.227.245].each do |ip_address|
17-
health_check.stub(:dns) { [a_packet(ip_address)] }
18-
expect(health_check.old_ip_address?).to be_true
17+
allow(health_check).to receive(:dns) { [a_packet(ip_address)] }
18+
expect(health_check.old_ip_address?).to be(true)
1919
end
2020

21-
health_check.stub(:dns) { [a_packet("1.2.3.4")] }
22-
expect(health_check.old_ip_address?).to be_false
21+
allow(health_check).to receive(:dns) { [a_packet("1.2.3.4")] }
22+
expect(health_check.old_ip_address?).to be(false)
2323
end
2424

2525
it "knows when a domain is an A record" do
26-
health_check.stub(:dns) { [a_packet("1.2.3.4")] }
27-
expect(health_check.a_record?).to be_true
28-
expect(health_check.cname_record?).to be_false
26+
allow(health_check).to receive(:dns) { [a_packet("1.2.3.4")] }
27+
expect(health_check.a_record?).to be(true)
28+
expect(health_check.cname_record?).to be(false)
2929
end
3030

3131
it "known when a domain is a CNAME record" do
32-
health_check.stub(:dns) { [cname_packet("pages.github.com")] }
33-
expect(health_check.cname_record?).to be_true
34-
expect(health_check.a_record?).to be_false
32+
allow(health_check).to receive(:dns) { [cname_packet("pages.github.com")] }
33+
expect(health_check.cname_record?).to be(true)
34+
expect(health_check.a_record?).to be(false)
3535
end
3636

3737
it "knows what an apex domain is" do
38-
health_check.stub(:domain) { "parkermoore.de" }
39-
expect(health_check.apex_domain?).to be_true
38+
allow(health_check).to receive(:domain) { "parkermoore.de" }
39+
expect(health_check.apex_domain?).to be(true)
4040

41-
health_check.stub(:domain) { "bbc.co.uk" }
42-
expect(health_check.apex_domain?).to be_true
41+
allow(health_check).to receive(:domain) { "bbc.co.uk" }
42+
expect(health_check.apex_domain?).to be(true)
4343
end
4444

4545
it "knows when the domain is on cloudflare" do
46-
health_check.stub(:dns) { [a_packet("108.162.196.20")] }
47-
expect(health_check.cloudflare_ip?).to be_true
46+
allow(health_check).to receive(:dns) { [a_packet("108.162.196.20")] }
47+
expect(health_check.cloudflare_ip?).to be(true)
4848

49-
health_check.stub(:dns) { [a_packet("1.1.1.1")] }
50-
expect(health_check.cloudflare_ip?).to be_false
49+
allow(health_check).to receive(:dns) { [a_packet("1.1.1.1")] }
50+
expect(health_check.cloudflare_ip?).to be(false)
5151
end
5252

5353
it "knows a subdomain is not an apex domain" do
54-
health_check.stub(:domain) { "blog.parkermoore.de" }
55-
expect(health_check.apex_domain?).to be_false
54+
allow(health_check).to receive(:domain) { "blog.parkermoore.de" }
55+
expect(health_check.apex_domain?).to be(false)
5656

57-
health_check.stub(:domain) { "www.bbc.co.uk" }
58-
expect(health_check.apex_domain?).to be_false
57+
allow(health_check).to receive(:domain) { "www.bbc.co.uk" }
58+
expect(health_check.apex_domain?).to be(false)
5959
end
6060

6161
it "knows what should be an apex record" do
62-
health_check.stub(:domain) { "parkermoore.de" }
63-
expect(health_check.should_be_a_record?).to be_true
62+
allow(health_check).to receive(:domain) { "parkermoore.de" }
63+
expect(health_check.should_be_a_record?).to be(true)
6464

65-
health_check.stub(:domain) { "bbc.co.uk" }
66-
expect(health_check.should_be_a_record?).to be_true
65+
allow(health_check).to receive(:domain) { "bbc.co.uk" }
66+
expect(health_check.should_be_a_record?).to be(true)
6767

68-
health_check.stub(:domain) { "blog.parkermoore.de" }
69-
expect(health_check.should_be_a_record?).to be_false
68+
allow(health_check).to receive(:domain) { "blog.parkermoore.de" }
69+
expect(health_check.should_be_a_record?).to be(false)
7070

71-
health_check.stub(:domain) { "www.bbc.co.uk" }
72-
expect(health_check.should_be_a_record?).to be_false
71+
allow(health_check).to receive(:domain) { "www.bbc.co.uk" }
72+
expect(health_check.should_be_a_record?).to be(false)
7373

74-
health_check.stub(:domain) { "foo.github.io" }
75-
expect(health_check.should_be_a_record?).to be_false
74+
allow(health_check).to receive(:domain) { "foo.github.io" }
75+
expect(health_check.should_be_a_record?).to be(false)
7676

77-
health_check.stub(:domain) { "pages.github.com" }
78-
expect(health_check.should_be_a_record?).to be_false
77+
allow(health_check).to receive(:domain) { "pages.github.com" }
78+
expect(health_check.should_be_a_record?).to be(false)
7979
end
8080

8181
it "can determine a valid GitHub Pages CNAME value" do
8282
["parkr.github.io", "mattr-.github.com"].each do |domain|
83-
health_check.stub(:dns) { [cname_packet(domain)] }
84-
expect(health_check.pointed_to_github_user_domain?).to be_true
83+
allow(health_check).to receive(:dns) { [cname_packet(domain)] }
84+
expect(health_check.pointed_to_github_user_domain?).to be(true)
8585
end
8686
["github.com", "ben.balter.com"].each do |domain|
87-
health_check.stub(:dns) { [cname_packet(domain)] }
88-
expect(health_check.pointed_to_github_user_domain?).to be_false
87+
allow(health_check).to receive(:dns) { [cname_packet(domain)] }
88+
expect(health_check.pointed_to_github_user_domain?).to be(false)
8989
end
9090
end
9191

9292
it "retrieves a site's dns record" do
93-
health_check.stub(:domain) { "pages.github.com" }
93+
allow(health_check).to receive(:domain) { "pages.github.com" }
9494
expect(health_check.dns.first.class).to eql(Net::DNS::RR::CNAME)
9595
end
9696

9797
it "can detect pages domains" do
98-
health_check.stub(:domain) { "pages.github.com" }
99-
expect(health_check.pages_domain?).to be_true
98+
allow(health_check).to receive(:domain) { "pages.github.com" }
99+
expect(health_check.pages_domain?).to be(true)
100100

101-
health_check.stub(:domain) { "pages.github.io" }
102-
expect(health_check.pages_domain?).to be_true
101+
allow(health_check).to receive(:domain) { "pages.github.io" }
102+
expect(health_check.pages_domain?).to be(true)
103103

104-
health_check.stub(:domain) { "pages.github.io." }
105-
expect(health_check.pages_domain?).to be_true
104+
allow(health_check).to receive(:domain) { "pages.github.io." }
105+
expect(health_check.pages_domain?).to be(true)
106106
end
107107

108108
it "doesn't detect non-pages domains as a pages domain" do
109-
health_check.stub(:domain) { "github.com" }
110-
expect(health_check.pages_domain?).to be_false
109+
allow(health_check).to receive(:domain) { "github.com" }
110+
expect(health_check.pages_domain?).to be(false)
111111

112-
health_check.stub(:domain) { "google.co.uk" }
113-
expect(health_check.pages_domain?).to be_false
112+
allow(health_check).to receive(:domain) { "google.co.uk" }
113+
expect(health_check.pages_domain?).to be(false)
114114
end
115115

116116
it "detects invalid doimains" do
117-
health_check.stub(:domain) { "github.com" }
118-
expect(health_check.valid_domain?).to be_true
117+
allow(health_check).to receive(:domain) { "github.com" }
118+
expect(health_check.valid_domain?).to be(true)
119119

120-
health_check.stub(:domain) { "github.invalid" }
121-
expect(health_check.valid_domain?).to be_false
120+
allow(health_check).to receive(:domain) { "github.invalid" }
121+
expect(health_check.valid_domain?).to be(false)
122122
end
123123

124124
it "returns valid json" do
125125
data = JSON.parse GitHubPages::HealthCheck.new("benbalter.com").to_json
126126
expect(data.length).to eql(10)
127-
data.each { |key, value| expect([true,false].include?(value)).should eql(true) }
127+
data.each { |key, value| expect([true,false].include?(value)).to eql(true) }
128128
end
129129

130130
end

spec/spec_helper.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
require File.expand_path("../../lib/github-pages-health-check.rb", __FILE__)
22

33
RSpec.configure do |config|
4-
config.treat_symbols_as_metadata_keys_with_true_values = true
4+
config.raise_errors_for_deprecations!
55
config.run_all_when_everything_filtered = true
66
config.filter_run :focus
77

0 commit comments

Comments
 (0)