spec/spec_helper.rb in cloudinary-1.7.0 vs spec/spec_helper.rb in cloudinary-1.8.0

- old
+ new

@@ -14,10 +14,18 @@ # Auth token KEY = "00112233FF99" ALT_KEY = "CCBB2233FF00" +Dir[File.join(File.dirname(__FILE__), '/support/**/*.rb')].each {|f| require f} + +module RSpec + def self.project_root + File.join(File.dirname(__FILE__), '..') + end +end + # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration RSpec.configure do |config| unless RSpec::Version::STRING.match( /^3/) config.treat_symbols_as_metadata_keys_with_true_values = true end @@ -134,10 +142,16 @@ # Verify that the given URL can be served by Cloudinary by fetching the resource from the server RSpec::Matchers.define :be_served_by_cloudinary do match do |url| if url.is_a? Array - url = Cloudinary::Utils.cloudinary_url( url[0], url[1]) + url, options = url + url = Cloudinary::Utils.cloudinary_url(url, options.clone) + if Cloudinary.config.upload_prefix + res_prefix_uri = URI.parse(Cloudinary.config.upload_prefix) + res_prefix_uri.path = '/res' + url.gsub!(/https?:\/\/res.cloudinary.com/, res_prefix_uri.to_s) + end end code = 0 @url = url RestClient.get @url do |response, request, result| @result = result \ No newline at end of file