assert-response 1.1.0 → 1.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. data/VERSION +1 -1
  2. data/lib/assert-response.rb +5 -5
  3. data/test/test_assert-response.rb +11 -0
  4. metadata +19 -19
data/VERSION CHANGED
@@ -1 +1 @@
1
- 1.1.0
1
+ 1.1.1
data/lib/assert-response.rb CHANGED
@@ -123,13 +123,13 @@ class AssertResponse
123
123
  end
124
124
  when /^not_found_(.+)$/ # not_found_[content_type] methods
125
125
  if ctype = CONTENT_TYPES[$1.to_sym]
126
- content_type ctype
127
- return body(args.first, :not_found)
126
+ body(args.first, :not_found)
127
+ return content_type ctype
128
128
  end
129
129
  else
130
130
  if ctype = CONTENT_TYPES[meth] # [content_type] methods
131
- content_type ctype
132
- return body(*args)
131
+ body(*args)
132
+ return content_type ctype
133
133
  elsif HTTP_STATUS_CODES[meth]
134
134
  return status HTTP_STATUS_CODES[meth]
135
135
  end
@@ -164,7 +164,6 @@ class AssertResponse
164
164
  # you can use the usual assert- methods (even without assert prefix)
165
165
  # and the json method gives you the parsed json object to test against
166
166
  def json(arg1=nil, arg2=nil, &code)
167
- content_type CONTENT_TYPES[:json]
168
167
  if code
169
168
  status arg1
170
169
  file, line, rest = caller[0].split(':', 3)
@@ -172,6 +171,7 @@ class AssertResponse
172
171
  elsif arg1
173
172
  body arg1, arg2
174
173
  end
174
+ content_type CONTENT_TYPES[:json] # we need to check the content type after status to get the errors
175
175
  end
176
176
 
177
177
  # Checks if the status is +status+. For status other then 5xx and error is raised if the response has an error.
data/test/test_assert-response.rb CHANGED
@@ -63,6 +63,10 @@ def app
63
63
  when '/error_code'
64
64
  status = 500
65
65
  body = "some error message"
66
+ when '/error_with_wrong_contenttype'
67
+ status = 500
68
+ headers['Content-Type'] = 'application/doesnotexists'
69
+ body = "some error message"
66
70
  when '/not_found'
67
71
  status = 404
68
72
  body = "<body>Not found</body>"
@@ -175,6 +179,13 @@ describe "assert-response" do
175
179
  end
176
180
  end
177
181
 
182
+ it "should check the error before the content type" do
183
+ get '/error_with_wrong_contenttype'
184
+ assert_raises AssertResponse::HttpError do
185
+ assert_response_html "huhi"
186
+ end
187
+ end
188
+
178
189
  it "should raise errors for some other sinatra errors" do
179
190
  get '/arg_error'
180
191
  assert_raises ArgumentError do
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: assert-response
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.0
4
+ version: 1.1.1
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2011-12-23 00:00:00.000000000Z
12
+ date: 2011-12-28 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rack-test
16
- requirement: &22354580 !ruby/object:Gem::Requirement
16
+ requirement: &13467220 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '0'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *22354580
24
+ version_requirements: *13467220
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: json
27
- requirement: &22354100 !ruby/object:Gem::Requirement
27
+ requirement: &13466740 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *22354100
35
+ version_requirements: *13466740
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: yard
38
- requirement: &22353580 !ruby/object:Gem::Requirement
38
+ requirement: &13466180 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '0'
44
44
  type: :development
45
45
  prerelease: false
46
- version_requirements: *22353580
46
+ version_requirements: *13466180
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: bundler
49
- requirement: &22353100 !ruby/object:Gem::Requirement
49
+ requirement: &13465680 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ~>
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: 1.0.0
55
55
  type: :development
56
56
  prerelease: false
57
- version_requirements: *22353100
57
+ version_requirements: *13465680
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: jeweler
60
- requirement: &22352580 !ruby/object:Gem::Requirement
60
+ requirement: &13465180 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ~>
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: 1.5.2
66
66
  type: :development
67
67
  prerelease: false
68
- version_requirements: *22352580
68
+ version_requirements: *13465180
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: rcov
71
- requirement: &22352100 !ruby/object:Gem::Requirement
71
+ requirement: &13464680 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: '0'
77
77
  type: :development
78
78
  prerelease: false
79
- version_requirements: *22352100
79
+ version_requirements: *13464680
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: rack-test
82
- requirement: &22351620 !ruby/object:Gem::Requirement
82
+ requirement: &13464140 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: '0'
88
88
  type: :runtime
89
89
  prerelease: false
90
- version_requirements: *22351620
90
+ version_requirements: *13464140
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: json
93
- requirement: &22351140 !ruby/object:Gem::Requirement
93
+ requirement: &13463580 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
98
98
  version: '0'
99
99
  type: :runtime
100
100
  prerelease: false
101
- version_requirements: *22351140
101
+ version_requirements: *13463580
102
102
  description:
103
103
  email: ! 'Base64.decode64(''bGludXhAbWFyY3JlbmVhcm5zLmRl
104
104
 
@@ -133,7 +133,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
133
133
  version: '0'
134
134
  segments:
135
135
  - 0
136
- hash: 2830934270081401981
136
+ hash: -3549079954542060070
137
137
  required_rubygems_version: !ruby/object:Gem::Requirement
138
138
  none: false
139
139
  requirements: