diff --git a/web/app/assets/javascripts/site_validator.js.coffee b/web/app/assets/javascripts/site_validator.js.coffee index c0ca5a284..fee2356cc 100644 --- a/web/app/assets/javascripts/site_validator.js.coffee +++ b/web/app/assets/javascripts/site_validator.js.coffee @@ -97,11 +97,9 @@ context.JK.SiteValidator = class SiteValidator renderErrors: (errors) => errdiv = @input_div.find('.error') if errmsg = context.JK.format_errors("site", errors) - @checkmark.hide() errdiv.show() errdiv.html(errmsg) else - @checkmark.show() errdiv.hide() errdiv.html('') diff --git a/web/spec/javascripts/site_validator_spec.js.coffee b/web/spec/javascripts/site_validator_spec.js.coffee index 5c1d0692f..21d7df584 100644 --- a/web/spec/javascripts/site_validator_spec.js.coffee +++ b/web/spec/javascripts/site_validator_spec.js.coffee @@ -14,32 +14,46 @@ describe "SiteValidator", -> window.gon.isNativeClient = true afterEach -> - @server.restore(); - - it "displays validator widget", -> - site_validator = new JK.SiteValidator('url') - site_validator.init() - site_validator.data_input.val('http://www.jamkazam.com') - site_validator.siteIsValid() - expect(site_validator.checkmark).toBeVisible() - - it "displays error for bad url", -> - site_validator = new JK.SiteValidator('url') - site_validator.init() - site_validator.data_input.val('www.jamkazam.com') - site_validator.did_blur() - expect(site_validator.checkmark).toBeHidden() - - xit "validates a good url", -> - url = 'http://www.jamkazam.com' - @server.respondWith("GET", '/api/data_validation?sitetype=url&data=' + encodeURIComponent(url), - [200, { "content-type": "application/json" }, '{ "message": "Valid Site" }']) - sinon.spy() - site_validator = new JK.SiteValidator('url') - site_validator.init() - site_validator.data_input.val(url) - site_validator.did_blur() - @server.respond() - expect(site_validator.checkmark).toBeVisible() + @server.restore() + describe "url site types", -> + it "displays validator widget", -> + site_validator = new JK.SiteValidator('url') + site_validator.init() + site_validator.data_input.val('http://www.jamkazam.com') + site_validator.siteIsValid() + expect(site_validator.checkmark).toBeVisible() + + it "displays error for bad url", -> + site_validator = new JK.SiteValidator('url') + site_validator.init() + site_validator.data_input.val('www.jamkazam.com') + site_validator.did_blur() + expect(site_validator.checkmark).toBeHidden() + + it "validates a good url", -> + url = 'http://www.jamkazam.com' + @server.respondWith("GET", '/api/data_validation?sitetype=url&data=' + encodeURIComponent(url), + [200, { "content-type": "application/json" }, JSON.stringify({"message": "Valid Site"})]) + sinon.spy() + site_validator = new JK.SiteValidator('url') + site_validator.init() + site_validator.data_input.val(url) + site_validator.did_blur() + @server.respond() + expect(site_validator.checkmark).toBeVisible() + + it "invalidates a good url", -> + url = 'http://www.jamkazam.comxx' + @server.respondWith("GET", '/api/data_validation?sitetype=url&data=' + encodeURIComponent(url), + [200, { "content-type": "application/json" }, JSON.stringify({"message": "Invalid Site"})]) + sinon.spy() + site_validator = new JK.SiteValidator('url') + site_validator.init() + site_validator.data_input.val(url) + site_validator.did_blur() + @server.respond() + expect(site_validator.checkmark).toBeHidden() + expect(site_validator.site_status).toEqual(false) +