Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #115 from Shopify/https_default

update default to https
  • Loading branch information...
commit 8f3c9b7ee28b67a532a859c5fb0f5998017765c8 2 parents 52046d5 + 4e929d3
@kevinhughes27 kevinhughes27 authored
View
14 test/detailed_log_subscriber_test.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://this-is-my-test-show.myshopify.com/admin"
ActiveResource::LogSubscriber.attach_to :active_resource
ActiveResource::DetailedLogSubscriber.attach_to :active_resource_detailed
@@ -26,9 +26,9 @@ 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_match /\-\-\> 200/, @logger.logged(:info)[1]
- assert_equal "Headers: {\"Accept\"=>\"application/json\", #{@ua_header}}", @logger.logged(:info)[2]
+ assert_equal "GET https://this-is-my-test-show.myshopify.com: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]
end
@@ -41,9 +41,9 @@ 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_match /\-\-\> 404/, @logger.logged(:info)[1]
+ assert_equal "GET https://this-is-my-test-show.myshopify.com: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]
+ assert_equal "Response:", @logger.logged(:info)[3]
end
end
View
2  test/fulfillment_test.rb
@@ -35,4 +35,4 @@ def setup
end
end
-end
+end
View
4 test/test_helper.rb
@@ -35,7 +35,7 @@ def setup
end
ShopifyAPI::Base.clear_session
- ShopifyAPI::Base.site = "http://localhost/admin"
+ ShopifyAPI::Base.site = "https://this-is-my-test-show.myshopify.com/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://this-is-my-test-show.myshopify.com/admin/#{endpoint}#{extension}"
end
FakeWeb.register_uri(method, url, {:body => body, :status => 200, :content_type => "text/#{format}", :content_length => 1}.merge(options))
Please sign in to comment.
Something went wrong with that request. Please try again.