Renamed method, and used present?
George Opritescu
2 fichiers modifiés avec 11 ajouts et 7 suppressions
+ 4
- 6
app/models/agents/website_agent.rb
@@ -151,7 +151,7 @@ module Agents |
||
| 151 | 151 |
errors.add(:base, "either url, url_from_event, or data_from_event are required") unless options['url'].present? || options['url_from_event'].present? || options['data_from_event'].present? |
| 152 | 152 |
errors.add(:base, "expected_update_period_in_days is required") unless options['expected_update_period_in_days'].present? |
| 153 | 153 |
validate_extract_options! |
| 154 |
- validate_consider_http_success_option! |
|
| 154 |
+ validate_http_success_codes! |
|
| 155 | 155 |
|
| 156 | 156 |
# Check for optional fields |
| 157 | 157 |
if options['mode'].present? |
@@ -169,16 +169,14 @@ module Agents |
||
| 169 | 169 |
validate_web_request_options! |
| 170 | 170 |
end |
| 171 | 171 |
|
| 172 |
- def validate_consider_http_success_option! |
|
| 172 |
+ def validate_http_success_codes! |
|
| 173 | 173 |
consider_success = options["http_success_codes"] |
| 174 |
- if consider_success != nil |
|
| 174 |
+ if consider_success.present? |
|
| 175 | 175 |
|
| 176 | 176 |
if (consider_success.class != Array) |
| 177 | 177 |
errors.add(:http_success_codes, "must be an array and specify at least one status code") |
| 178 | 178 |
else |
| 179 |
- if consider_success.blank? |
|
| 180 |
- errors.add(:http_success_codes, "must not be empty") |
|
| 181 |
- elsif consider_success.uniq.count != consider_success.count |
|
| 179 |
+ if consider_success.uniq.count != consider_success.count |
|
| 182 | 180 |
errors.add(:http_success_codes, "duplicate http code found") |
| 183 | 181 |
else |
| 184 | 182 |
if consider_success.any?{|e| e.to_s !~ /^\d+$/ }
|
+ 7
- 1
spec/models/agents/website_agent_spec.rb
@@ -57,7 +57,13 @@ describe Agents::WebsiteAgent do |
||
| 57 | 57 |
expect(@checker).not_to be_valid |
| 58 | 58 |
|
| 59 | 59 |
@checker.options['http_success_codes'] = [] |
| 60 |
- expect(@checker).not_to be_valid |
|
| 60 |
+ expect(@checker).to be_valid |
|
| 61 |
+ |
|
| 62 |
+ @checker.options['http_success_codes'] = '' |
|
| 63 |
+ expect(@checker).to be_valid |
|
| 64 |
+ |
|
| 65 |
+ @checker.options['http_success_codes'] = false |
|
| 66 |
+ expect(@checker).to be_valid |
|
| 61 | 67 |
end |
| 62 | 68 |
|
| 63 | 69 |
it "should validate uniqueness_look_back" do |