Skip to content

Commit

Permalink
Merge 03294ce into 518885f
Browse files Browse the repository at this point in the history
  • Loading branch information
@AnalogJ
AnalogJ committed Aug 27, 2016
2 parents 518885f + 03294ce commit b6453f6
Show file tree
Hide file tree
Showing 19 changed files with 440 additions and 440 deletions.
12 changes: 6 additions & 6 deletions tests/fixtures/cassettes/dnsmadeeasy/IntegrationTests/test_Provider_authenticate.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,18 @@ interactions:
Content-Length: ['2']
Content-Type: [application/json]
User-Agent: [python-requests/2.9.1]
x-dnsme-requestDate: ['Wed, 30 Mar 2016 01:58:56 GMT']
x-dnsme-requestDate: ['Sat, 27 Aug 2016 19:30:09 GMT']
method: GET
uri: http://api.sandbox.dnsmadeeasy.com/V2.0/dns/managed/name?domainname=capsulecd.com
response:
body: {string: !!python/unicode '{"name":"capsulecd.com","id":874984,"created":1458864000000,"nameServers":[{"fqdn":"ns0.dnsmadeeasy.com","ipv4":"208.94.148.2","ipv6":"2600:1800:0::1"},{"fqdn":"ns1.dnsmadeeasy.com","ipv4":"208.80.124.2","ipv6":"2600:1801:1::1"},{"fqdn":"ns2.dnsmadeeasy.com","ipv4":"208.80.126.2","ipv6":"2600:1802:2::1"},{"fqdn":"ns3.dnsmadeeasy.com","ipv4":"208.80.125.2","ipv6":"2600:1801:3::1"},{"fqdn":"ns4.dnsmadeeasy.com","ipv4":"208.80.127.2","ipv6":"2600:1802:4::1"}],"pendingActionId":0,"updated":1459045687231,"processMulti":false,"activeThirdParties":[],"delegateNameServers":["dawn.ns.cloudflare.com.","owen.ns.cloudflare.com."],"folderId":1668,"gtdEnabled":false}'}
body: {string: !!python/unicode '{"name":"capsulecd.com","id":874984,"created":1458864000000,"processMulti":false,"activeThirdParties":[],"delegateNameServers":["dawn.ns.cloudflare.com.","owen.ns.cloudflare.com."],"folderId":1668,"gtdEnabled":false,"nameServers":[{"ipv4":"208.94.147.112","ipv6":"2600:1800:0::1","fqdn":"ns1.sandbox.dnsmadeeasy.com"},{"ipv4":"208.94.147.113","ipv6":"2600:1801:1::1","fqdn":"ns2.sandbox.dnsmadeeasy.com"},{"ipv4":"208.94.147.114","ipv6":"2600:1802:2::1","fqdn":"ns3.sandbox.dnsmadeeasy.com"},{"ipv4":"208.94.147.116","ipv6":"2600:1801:3::1","fqdn":"ns4.sandbox.dnsmadeeasy.com"}],"pendingActionId":0,"updated":1472326176934}'}
headers:
content-type: [application/json]
date: ['Wed, 30 Mar 2016 01:58:57 GMT']
date: ['Sat, 27 Aug 2016 19:30:10 GMT']
server: [Apache-Coyote/1.1]
set-cookie: [JSESSIONID=5E12F54092D4FF53CEE0FFF576513598; Path=/V2.0/; HttpOnly]
x-dnsme-requestid: [2fd4f129-4f1f-4589-8368-070ffa108ccf]
set-cookie: [JSESSIONID=342BF3D0CF1A60BD7985B286A6BE9471; Path=/V2.0/; HttpOnly]
x-dnsme-requestid: [95ac709b-98ab-44a1-b5bd-d0f143dcc1f3]
x-dnsme-requestlimit: ['150']
x-dnsme-requestsremaining: ['149']
x-dnsme-requestsremaining: ['91']
status: {code: 200, message: OK}
version: 1
86 changes: 43 additions & 43 deletions ...deeasy/IntegrationTests/test_Provider_authenticate_with_unmanaged_domain_should_fail.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,50 +8,50 @@ interactions:
Content-Length: ['2']
Content-Type: [application/json]
User-Agent: [python-requests/2.9.1]
x-dnsme-requestDate: ['Wed, 30 Mar 2016 01:58:57 GMT']
x-dnsme-requestDate: ['Sat, 27 Aug 2016 19:30:09 GMT']
method: GET
uri: http://api.sandbox.dnsmadeeasy.com/V2.0/dns/managed/name?domainname=thisisadomainidonotown.com
response:
body: {string: !!python/unicode "\r\n\r\n\r\n\r\n\r\n\r\n\r\n<!DOCTYPE html>\r\
\n<html>\r\n<head>\r\n\t<title>Management Console</title>\r\n\t\r\n\r\n\r\n\
\ <meta charset=\"utf-8\" />\r\n\r\n\r\n\t<link rel=\"stylesheet\" href='/V2.0/css/ui.jqgrid.css;jsessionid=E58D035061346B05CE29B3F890F30681'\
\ type=\"text/css\" />\r\n\t<link rel=\"stylesheet\" href='/V2.0/css/jquery.multiselect.css;jsessionid=E58D035061346B05CE29B3F890F30681'\
\ type=\"text/css\" />\r\n\t<link rel=\"stylesheet\" href='/V2.0/css/jquery.multiselect.filter.css;jsessionid=E58D035061346B05CE29B3F890F30681'\
\ type=\"text/css\" />\r\n\t<link rel=\"stylesheet\" href='/V2.0/css/jquery.jqplot.min.css;jsessionid=E58D035061346B05CE29B3F890F30681'\
\ type=\"text/css\" />\r\n\t<link rel=\"stylesheet\" href='/V2.0/css/jquery.dataTables.css;jsessionid=E58D035061346B05CE29B3F890F30681'\
\ type=\"text/css\" />\r\n\t\r\n\t<link rel=\"stylesheet\" href='/V2.0/css/console.css;jsessionid=E58D035061346B05CE29B3F890F30681'\
\ type=\"text/css\" />\r\n\r\n\t<link rel=\"stylesheet\" href='/V2.0/css/dnsme.css;jsessionid=E58D035061346B05CE29B3F890F30681'\
\ type=\"text/css\" title=\"dnsme\" />\r\n\t<link rel=\"stylesheet\" href='/V2.0/css/custom-theme/jquery-ui-1.8.14.custom.css;jsessionid=E58D035061346B05CE29B3F890F30681'\
\ type=\"text/css\" title=\"dnsme\" />\r\n\t<link rel=\"stylesheet\" href='/V2.0/css/jquery.fancybox-1.3.4.css;jsessionid=E58D035061346B05CE29B3F890F30681'\
\ type=\"text/css\" media=\"screen\" />\r\n <link rel=\"stylesheet\" href='/V2.0/css/realtime-stats/realtime-stats-chart.css;jsessionid=E58D035061346B05CE29B3F890F30681'\
\ <meta charset=\"utf-8\" />\r\n\r\n\r\n\t<link rel=\"stylesheet\" href='/V2.0/css/ui.jqgrid.css;jsessionid=355ACD8ACF9F26FD792D6D017ABF8429'\
\ type=\"text/css\" />\r\n\t<link rel=\"stylesheet\" href='/V2.0/css/jquery.multiselect.css;jsessionid=355ACD8ACF9F26FD792D6D017ABF8429'\
\ type=\"text/css\" />\r\n\t<link rel=\"stylesheet\" href='/V2.0/css/jquery.multiselect.filter.css;jsessionid=355ACD8ACF9F26FD792D6D017ABF8429'\
\ type=\"text/css\" />\r\n\t<link rel=\"stylesheet\" href='/V2.0/css/jquery.jqplot.min.css;jsessionid=355ACD8ACF9F26FD792D6D017ABF8429'\
\ type=\"text/css\" />\r\n\t<link rel=\"stylesheet\" href='/V2.0/css/jquery.dataTables.css;jsessionid=355ACD8ACF9F26FD792D6D017ABF8429'\
\ type=\"text/css\" />\r\n\t\r\n\t<link rel=\"stylesheet\" href='/V2.0/css/console.css;jsessionid=355ACD8ACF9F26FD792D6D017ABF8429'\
\ type=\"text/css\" />\r\n\r\n\t<link rel=\"stylesheet\" href='/V2.0/css/dnsme.css;jsessionid=355ACD8ACF9F26FD792D6D017ABF8429'\
\ type=\"text/css\" title=\"dnsme\" />\r\n\t<link rel=\"stylesheet\" href='/V2.0/css/custom-theme/jquery-ui-1.8.14.custom.css;jsessionid=355ACD8ACF9F26FD792D6D017ABF8429'\
\ type=\"text/css\" title=\"dnsme\" />\r\n\t<link rel=\"stylesheet\" href='/V2.0/css/jquery.fancybox-1.3.4.css;jsessionid=355ACD8ACF9F26FD792D6D017ABF8429'\
\ type=\"text/css\" media=\"screen\" />\r\n <link rel=\"stylesheet\" href='/V2.0/css/realtime-stats/realtime-stats-chart.css;jsessionid=355ACD8ACF9F26FD792D6D017ABF8429'\
\ type=\"text/css\" media=\"screen\" />\r\n\r\n\t<script type=\"text/javascript\"\
\ src='/V2.0/js/jquery-1.6.2.min.js;jsessionid=E58D035061346B05CE29B3F890F30681'\
\ ></script>\r\n\t<script type=\"text/javascript\" src='/V2.0/js/jquery-ui-1.8.16.custom.min.js;jsessionid=E58D035061346B05CE29B3F890F30681'\
\ ></script>\r\n\t<script type=\"text/javascript\" src='/V2.0/js/jquery.cookie.js;jsessionid=E58D035061346B05CE29B3F890F30681'\
\ ></script>\r\n\t<script type=\"text/javascript\" src='/V2.0/js/i18n/grid.locale-en.js;jsessionid=E58D035061346B05CE29B3F890F30681'\
\ ></script>\r\n\t<script type=\"text/javascript\" src='/V2.0/js/jquery.jqGrid.min.js;jsessionid=E58D035061346B05CE29B3F890F30681'\
\ ></script>\r\n\t<script type=\"text/javascript\" src='/V2.0/js/jquery.validate.js;jsessionid=E58D035061346B05CE29B3F890F30681'\
\ ></script>\r\n\t<script type=\"text/javascript\" src='/V2.0/js/jquery.populate.js;jsessionid=E58D035061346B05CE29B3F890F30681'\
\ ></script>\r\n\t<script type=\"text/javascript\" src='/V2.0/js/jquery.dropdownPlain.js;jsessionid=E58D035061346B05CE29B3F890F30681'\
\ ></script>\r\n\t<script type=\"text/javascript\" src='/V2.0/js/jquery.metadata.js;jsessionid=E58D035061346B05CE29B3F890F30681'\
\ ></script>\r\n\t<script type=\"text/javascript\" src='/V2.0/js/jquery.multiselect.js;jsessionid=E58D035061346B05CE29B3F890F30681'\
\ ></script>\r\n\t<script type=\"text/javascript\" src='/V2.0/js/jquery.multiselect.filter.js;jsessionid=E58D035061346B05CE29B3F890F30681'\
\ ></script>\r\n\t<script type=\"text/javascript\" src='/V2.0/js/jquery.diff.min.js;jsessionid=E58D035061346B05CE29B3F890F30681'\
\ ></script>\r\n\t<script type=\"text/javascript\" src='/V2.0/js/jquery.tinysort.min.js;jsessionid=E58D035061346B05CE29B3F890F30681'\
\ ></script>\r\n\t<script type=\"text/javascript\" src='/V2.0/js/jquery.fancybox-1.3.4.js;jsessionid=E58D035061346B05CE29B3F890F30681'\
\ ></script>\r\n\t<script type=\"text/javascript\" src='/V2.0/js/jquery.dataTables.js;jsessionid=E58D035061346B05CE29B3F890F30681'\
\ ></script>\r\n\t\r\n\t\r\n\t<script type=\"text/javascript\" src='/V2.0/js/date.js;jsessionid=E58D035061346B05CE29B3F890F30681'\
\ src='/V2.0/js/jquery-1.6.2.min.js;jsessionid=355ACD8ACF9F26FD792D6D017ABF8429'\
\ ></script>\r\n\t<script type=\"text/javascript\" src='/V2.0/js/jquery-ui-1.8.16.custom.min.js;jsessionid=355ACD8ACF9F26FD792D6D017ABF8429'\
\ ></script>\r\n\t<script type=\"text/javascript\" src='/V2.0/js/jquery.cookie.js;jsessionid=355ACD8ACF9F26FD792D6D017ABF8429'\
\ ></script>\r\n\t<script type=\"text/javascript\" src='/V2.0/js/i18n/grid.locale-en.js;jsessionid=355ACD8ACF9F26FD792D6D017ABF8429'\
\ ></script>\r\n\t<script type=\"text/javascript\" src='/V2.0/js/jquery.jqGrid.min.js;jsessionid=355ACD8ACF9F26FD792D6D017ABF8429'\
\ ></script>\r\n\t<script type=\"text/javascript\" src='/V2.0/js/jquery.validate.js;jsessionid=355ACD8ACF9F26FD792D6D017ABF8429'\
\ ></script>\r\n\t<script type=\"text/javascript\" src='/V2.0/js/jquery.populate.js;jsessionid=355ACD8ACF9F26FD792D6D017ABF8429'\
\ ></script>\r\n\t<script type=\"text/javascript\" src='/V2.0/js/jquery.dropdownPlain.js;jsessionid=355ACD8ACF9F26FD792D6D017ABF8429'\
\ ></script>\r\n\t<script type=\"text/javascript\" src='/V2.0/js/jquery.metadata.js;jsessionid=355ACD8ACF9F26FD792D6D017ABF8429'\
\ ></script>\r\n\t<script type=\"text/javascript\" src='/V2.0/js/jquery.multiselect.js;jsessionid=355ACD8ACF9F26FD792D6D017ABF8429'\
\ ></script>\r\n\t<script type=\"text/javascript\" src='/V2.0/js/jquery.multiselect.filter.js;jsessionid=355ACD8ACF9F26FD792D6D017ABF8429'\
\ ></script>\r\n\t<script type=\"text/javascript\" src='/V2.0/js/jquery.diff.min.js;jsessionid=355ACD8ACF9F26FD792D6D017ABF8429'\
\ ></script>\r\n\t<script type=\"text/javascript\" src='/V2.0/js/jquery.tinysort.min.js;jsessionid=355ACD8ACF9F26FD792D6D017ABF8429'\
\ ></script>\r\n\t<script type=\"text/javascript\" src='/V2.0/js/jquery.fancybox-1.3.4.js;jsessionid=355ACD8ACF9F26FD792D6D017ABF8429'\
\ ></script>\r\n\t<script type=\"text/javascript\" src='/V2.0/js/jquery.dataTables.js;jsessionid=355ACD8ACF9F26FD792D6D017ABF8429'\
\ ></script>\r\n\t\r\n\t\r\n\t<script type=\"text/javascript\" src='/V2.0/js/date.js;jsessionid=355ACD8ACF9F26FD792D6D017ABF8429'\
\ ></script>\r\n <script>Date.now = function() { return +new Date; };</script>\r\
\n\r\n\t<script type=\"text/javascript\" src='/V2.0/js/jquery.pagination.js;jsessionid=E58D035061346B05CE29B3F890F30681'\
\ ></script>\r\n\r\n\t<script type=\"text/javascript\" src='/V2.0/js/jquery.blockUI.js;jsessionid=E58D035061346B05CE29B3F890F30681'\
\ ></script>\r\n\r\n\t<script type=\"text/javascript\" src='/V2.0/js/highcharts.js;jsessionid=E58D035061346B05CE29B3F890F30681'\
\ ></script>\r\n\r\n <script type=\"text/javascript\" src='/V2.0/js/console.js;jsessionid=E58D035061346B05CE29B3F890F30681'\
\n\r\n\t<script type=\"text/javascript\" src='/V2.0/js/jquery.pagination.js;jsessionid=355ACD8ACF9F26FD792D6D017ABF8429'\
\ ></script>\r\n\r\n\t<script type=\"text/javascript\" src='/V2.0/js/jquery.blockUI.js;jsessionid=355ACD8ACF9F26FD792D6D017ABF8429'\
\ ></script>\r\n\r\n\t<script type=\"text/javascript\" src='/V2.0/js/highcharts.js;jsessionid=355ACD8ACF9F26FD792D6D017ABF8429'\
\ ></script>\r\n\r\n <script type=\"text/javascript\" src='/V2.0/js/console.js;jsessionid=355ACD8ACF9F26FD792D6D017ABF8429'\
\ ></script>\r\n\r\n <script>\r\n var require = {\r\n \
\ config: {\r\n 'DataStore' : {\r\n baseUrl:\
\ '/V2.0/realtimestats;jsessionid=E58D035061346B05CE29B3F890F30681'\r\n \
\ '/V2.0/realtimestats;jsessionid=355ACD8ACF9F26FD792D6D017ABF8429'\r\n \
\ }\r\n }\r\n }\r\n </script>\r\n \r\n\
<script type=\"text/javascript\" src='/V2.0/js/realtimestats/libs/requirejs/require.js;jsessionid=E58D035061346B05CE29B3F890F30681'\
\ ></script>\r\n<script>\r\n require.config({\r\n baseUrl: '/V2.0/js/realtimestats;jsessionid=E58D035061346B05CE29B3F890F30681'\r\
<script type=\"text/javascript\" src='/V2.0/js/realtimestats/libs/requirejs/require.js;jsessionid=355ACD8ACF9F26FD792D6D017ABF8429'\
\ ></script>\r\n<script>\r\n require.config({\r\n baseUrl: '/V2.0/js/realtimestats;jsessionid=355ACD8ACF9F26FD792D6D017ABF8429'\r\
\n });\r\n</script>\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\t\r\n\t<script>\r\
\n\t\t$(function() {\r\n\t\t\t$('.tabs').tabs();\r\n\t\t\t$('input:submit').button();\r\
\n\t\t\t$('.ui-icon').hover(\r\n\t\t\t\t\tfunction() { $(this).addClass('ui-state-hover');\
Expand Down Expand Up @@ -81,7 +81,7 @@ interactions:
\n\t\tTo view the status of an existing ticket, visit the <a style=\"text-decoration:\
\ underline\" href=\"http://support.dnsmadeeasy.com\">support site</a>.\r\n\
\t</p>\r\n</div>\r\n\r\n<script>\r\n\r\n\tfunction showSubmitTicket() {\r\n\
\t\t$('#submitTicket').dialog('open');\r\n\t}\r\n\t\r\n\tajaxForm('/V2.0/support;jsessionid=E58D035061346B05CE29B3F890F30681',\
\t\t$('#submitTicket').dialog('open');\r\n\t}\r\n\t\r\n\tajaxForm('/V2.0/support;jsessionid=355ACD8ACF9F26FD792D6D017ABF8429',\
\ 'POST', '#submitTicketForm', '#submitTicketErrors', function(data, responseText,\
\ jqXHR) {\r\n\t\t\r\n\t\t$('#dialog').dialog(\"destroy\");\r\n\t\t$(\"#dialog\"\
)\r\n\t\t\t.html(\r\n\t\t\t\t'Your support request was successfully submitted.\
Expand All @@ -95,26 +95,26 @@ interactions:
\ {resetForm:true});\r\n\t\t\t\t\t}\r\n\t\t\t\t});\r\n\r\n\t}, '#submitTicket',\
\ {\r\n\t\twidth: 600,\r\n\t\tblock: true\r\n\t});\t\r\n\t\r\n</script>\r\n\
<div style=\"width: 400px;margin: 0 auto;position: relative;top: 200px; text-align:\
\ center\">\r\n\t<a href=\"/console\">\r\n\t\t<img src=\"/V2.0/img/logo_dns.png;jsessionid=E58D035061346B05CE29B3F890F30681\"\
\ center\">\r\n\t<a href=\"/console\">\r\n\t\t<img src=\"/V2.0/img/logo_dns.png;jsessionid=355ACD8ACF9F26FD792D6D017ABF8429\"\
/>\r\n\t</a>\r\n\t<h3>A system error has occurred.</h3>\r\n\t<p style=\"margin:\
\ 3em auto\">\r\n\t\tHave no fear - our team of emergency response nerds have\
\ already been alerted and are on the case.\r\n\t</p> \r\n\r\n\t<a href=\"\
/V2.0/;jsessionid=E58D035061346B05CE29B3F890F30681\">Return to console</a>\t\
/V2.0/;jsessionid=355ACD8ACF9F26FD792D6D017ABF8429\">Return to console</a>\t\
<br class=\"clear\"/>\r\n\t\r\n\t\t<a id=\"submitTicketLink\" onclick=\"showSubmitTicket();\"\
\ >Submit a support ticket</a>\r\n\t\r\n\t<a target=\"_blank\" href=\"http://support.dnsmadeeasy.com\"\
>Support Center</a>\r\n\t<br class=\"clear\"/>\r\n\t<div style=\"margin-top:\
\ 2em\">\r\n\t\t<small>Current IP address: <br />\r\n\t\tLast logged in\
\ on Sun Mar 27 00:00:00 UTC 2016 from 208.72.142.184</small><br />\r\n\t\
\ on Sat Aug 27 00:00:00 UTC 2016 from 208.72.142.184</small><br />\r\n\t\
</div>\r\n\t<div style=\"margin-top: 2em\">\r\n\t\t<small>Current Date and\
\ Time: 2016-03-30 01:58:58:108</small><br />\r\n\t</div>\r\n\t\r\n</div>\r\
\ Time: 2016-08-27 19:30:10:421</small><br />\r\n\t</div>\r\n\t\r\n</div>\r\
\n\r\n</body>\r\n</html>"}
headers:
content-type: [text/html;charset=ISO-8859-1]
date: ['Wed, 30 Mar 2016 01:58:57 GMT']
date: ['Sat, 27 Aug 2016 19:30:10 GMT']
server: [Apache-Coyote/1.1]
set-cookie: [JSESSIONID=E58D035061346B05CE29B3F890F30681; Path=/V2.0/; HttpOnly]
x-dnsme-requestid: [58da9a2a-a1b5-418f-92ba-34757bc47633]
set-cookie: [JSESSIONID=355ACD8ACF9F26FD792D6D017ABF8429; Path=/V2.0/; HttpOnly]
x-dnsme-requestid: [7f3073f6-fb01-413d-ab0a-29437ea94315]
x-dnsme-requestlimit: ['150']
x-dnsme-requestsremaining: ['148']
x-dnsme-requestsremaining: ['90']
status: {code: 404, message: Not Found}
version: 1

0 comments on commit b6453f6

Please sign in to comment.