Permalink
Browse files

update default to https

  • Loading branch information...
1 parent 4aa2f42 commit 7a0b38bcbee2827e7809b23662aa2f71f481fbbc @kevinhughes27 kevinhughes27 committed Feb 3, 2014
Showing with 6 additions and 6 deletions.
  1. +3 −3 test/detailed_log_subscriber_test.rb
  2. +1 −1 test/fulfillment_test.rb
  3. +2 −2 test/test_helper.rb
@@ -10,7 +10,7 @@ def setup
@ua_header = "\"User-Agent\"=>\"ShopifyAPI/#{ShopifyAPI::VERSION} ActiveResource/#{ActiveResource::VERSION::STRING} Ruby/#{RUBY_VERSION}\""
ShopifyAPI::Base.clear_session
- ShopifyAPI::Base.site = "http://localhost/admin"
+ ShopifyAPI::Base.site = "https://localhost/admin"
ActiveResource::LogSubscriber.attach_to :active_resource
ActiveResource::DetailedLogSubscriber.attach_to :active_resource_detailed
@@ -26,7 +26,7 @@ def set_logger(logger)
ShopifyAPI::Page.find(1)
assert_equal 4, @logger.logged(:info).size
- assert_equal "GET http://localhost:80/admin/pages/1.json", @logger.logged(:info)[0]
+ assert_equal "GET https://localhost:443/admin/pages/1.json", @logger.logged(:info)[0]
assert_match /\-\-\> 200/, @logger.logged(:info)[1]
assert_equal "Headers: {\"Accept\"=>\"application/json\", #{@ua_header}}", @logger.logged(:info)[2]
assert_match /Response:\n\{\"page\"\:\{((\"id\"\:1)|(\"title\"\:\"Shopify API\")),((\"id\"\:1)|(\"title\"\:\"Shopify API\"))\}\}/, @logger.logged(:info)[3]
@@ -41,7 +41,7 @@ def set_logger(logger)
end
assert_equal 4, @logger.logged(:info).size
- assert_equal "GET http://localhost:80/admin/pages/2.json", @logger.logged(:info)[0]
+ assert_equal "GET https://localhost:443/admin/pages/2.json", @logger.logged(:info)[0]
assert_match /\-\-\> 404/, @logger.logged(:info)[1]
assert_equal "Headers: {\"Accept\"=>\"application/json\", #{@ua_header}}", @logger.logged(:info)[2]
assert_equal "Response:", @logger.logged(:info)[3]
@@ -35,4 +35,4 @@ def setup
end
end
-end
+end
View
@@ -35,7 +35,7 @@ def setup
end
ShopifyAPI::Base.clear_session
- ShopifyAPI::Base.site = "http://localhost/admin"
+ ShopifyAPI::Base.site = "https://localhost/admin"
ShopifyAPI::Base.password = nil
ShopifyAPI::Base.user = nil
end
@@ -62,7 +62,7 @@ def fake(endpoint, options={})
url = if options.has_key?(:url)
options[:url]
else
- "http://localhost/admin/#{endpoint}#{extension}"
+ "https://localhost/admin/#{endpoint}#{extension}"
end
FakeWeb.register_uri(method, url, {:body => body, :status => 200, :content_type => "text/#{format}", :content_length => 1}.merge(options))

0 comments on commit 7a0b38b

Please sign in to comment.