Skip to content

Commit 34de6a1

Browse files
committed
Replace deprecated should syntax with expect
1 parent ee4f638 commit 34de6a1

File tree

1 file changed

+48
-47
lines changed

1 file changed

+48
-47
lines changed

spec/pardot/http_spec.rb

Lines changed: 48 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,132 +1,133 @@
1+
require 'byebug'
12
require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
23

34
describe Pardot::Http do
4-
5+
56
before do
67
@client = create_client
78
fake_authenticate @client, "my_api_key"
89
end
9-
10+
1011
def create_client
1112
@client = Pardot::Client.new "[email protected]", "foo", "bar"
1213
end
13-
14+
1415
describe "get" do
15-
16+
1617
def get object = "foo", path = "/bar", params = {}
1718
@client.get object, path, params
1819
end
19-
20+
2021
it "should notice errors and raise them as Pardot::ResponseError" do
2122
fake_get "/api/foo/version/3/bar?format=simple",
2223
%(?xml version="1.0" encoding="UTF-8"?>\n<rsp stat="fail" version="1.0">\n <err code="15">Login failed</err>\n</rsp>\n)
23-
24+
2425
lambda { get }.should raise_error(Pardot::ResponseError)
2526
end
26-
27+
2728
it "should catch and reraise SocketErrors as Pardot::NetError" do
28-
Pardot::Client.should_receive(:get).and_raise(SocketError)
29-
29+
Pardot::Client.expect(:get).and_raise(SocketError)
30+
3031
lambda { get }.should raise_error(Pardot::NetError)
3132
end
32-
33+
3334
it "should call handle_expired_api_key when the api key expires" do
3435
fake_get "/api/foo/version/3/bar?format=simple",
3536
%(?xml version="1.0" encoding="UTF-8"?>\n<rsp stat="fail" version="1.0">\n <err code="15">Invalid API key or user key</err>\n</rsp>\n)
36-
37-
@client.should_receive(:handle_expired_api_key)
37+
38+
@client.expect(:handle_expired_api_key)
3839
get
3940
end
40-
41+
4142
end
42-
43+
4344
describe "post" do
44-
45+
4546
def post object = "foo", path = "/bar", params = {}
4647
@client.post object, path, params
4748
end
48-
49+
4950
it "should notice errors and raise them as Pardot::ResponseError" do
5051
fake_post "/api/foo/version/3/bar?format=simple",
5152
%(?xml version="1.0" encoding="UTF-8"?>\n<rsp stat="fail" version="1.0">\n <err code="15">Login failed</err>\n</rsp>\n)
52-
53+
5354
lambda { post }.should raise_error(Pardot::ResponseError)
5455
end
55-
56+
5657
it "should catch and reraise SocketErrors as Pardot::NetError" do
57-
Pardot::Client.should_receive(:post).and_raise(SocketError)
58-
58+
Pardot::Client.expect(:post).and_raise(SocketError)
59+
5960
lambda { post }.should raise_error(Pardot::NetError)
6061
end
61-
62+
6263
it "should call handle_expired_api_key when the api key expires" do
6364
fake_post "/api/foo/version/3/bar?format=simple",
6465
%(?xml version="1.0" encoding="UTF-8"?>\n<rsp stat="fail" version="1.0">\n <err code="15">Invalid API key or user key</err>\n</rsp>\n)
65-
66-
@client.should_receive(:handle_expired_api_key)
66+
67+
@client.expect(:handle_expired_api_key)
6768
post
6869
end
69-
70+
7071
end
7172

7273
describe "getV4" do
73-
74+
7475
def get object = "foo", path = "/bar", params = {}
7576
@client.version = "4"
7677
@client.get object, path, params
7778
end
78-
79+
7980
it "should notice errors and raise them as Pardot::ResponseError" do
8081
fake_get "/api/foo/version/4/bar?format=simple",
8182
%(?xml version="1.0" encoding="UTF-8"?>\n<rsp stat="fail" version="1.0">\n <err code="15">Login failed</err>\n</rsp>\n)
82-
83+
8384
lambda { get }.should raise_error(Pardot::ResponseError)
8485
end
85-
86+
8687
it "should catch and reraise SocketErrors as Pardot::NetError" do
87-
Pardot::Client.should_receive(:get).and_raise(SocketError)
88-
88+
Pardot::Client.expect(:get).and_raise(SocketError)
89+
8990
lambda { get }.should raise_error(Pardot::NetError)
9091
end
91-
92+
9293
it "should call handle_expired_api_key when the api key expires" do
9394
fake_get "/api/foo/version/4/bar?format=simple",
9495
%(?xml version="1.0" encoding="UTF-8"?>\n<rsp stat="fail" version="1.0">\n <err code="15">Invalid API key or user key</err>\n</rsp>\n)
95-
96-
@client.should_receive(:handle_expired_api_key)
96+
97+
@client.expect(:handle_expired_api_key)
9798
get
9899
end
99-
100+
100101
end
101-
102+
102103
describe "postV4" do
103-
104+
104105
def post object = "foo", path = "/bar", params = {}
105106
@client.version = "4"
106107
@client.post object, path, params
107108
end
108-
109+
109110
it "should notice errors and raise them as Pardot::ResponseError" do
110111
fake_post "/api/foo/version/4/bar?format=simple",
111112
%(?xml version="1.0" encoding="UTF-8"?>\n<rsp stat="fail" version="1.0">\n <err code="15">Login failed</err>\n</rsp>\n)
112-
113+
113114
lambda { post }.should raise_error(Pardot::ResponseError)
114115
end
115-
116+
116117
it "should catch and reraise SocketErrors as Pardot::NetError" do
117-
Pardot::Client.should_receive(:post).and_raise(SocketError)
118-
118+
Pardot::Client.expect(:post).and_raise(SocketError)
119+
119120
lambda { post }.should raise_error(Pardot::NetError)
120121
end
121-
122+
122123
it "should call handle_expired_api_key when the api key expires" do
123124
fake_post "/api/foo/version/4/bar?format=simple",
124125
%(?xml version="1.0" encoding="UTF-8"?>\n<rsp stat="fail" version="1.0">\n <err code="15">Invalid API key or user key</err>\n</rsp>\n)
125-
126-
@client.should_receive(:handle_expired_api_key)
126+
127+
@client.expect(:handle_expired_api_key)
127128
post
128129
end
129-
130+
130131
end
131-
132-
end
132+
133+
end

0 commit comments

Comments
 (0)