From febca766e7e00e7b12f247ed43d04bf2f18e4dcb Mon Sep 17 00:00:00 2001 From: Jonathan Kolyer Date: Tue, 10 Feb 2015 05:26:56 +0000 Subject: [PATCH] VRFS-2698 fixture loading --- .../javascripts/site_validator.js.coffee | 2 +- .../fixtures/siteValidator.html.slim | 3 +++ .../fixtures/site_validator_spec.html.slim | 4 ---- .../javascripts/site_validator_spec.js.coffee | 18 ++++++++++-------- 4 files changed, 14 insertions(+), 13 deletions(-) create mode 100644 web/spec/javascripts/fixtures/siteValidator.html.slim delete mode 100644 web/spec/javascripts/fixtures/site_validator_spec.html.slim diff --git a/web/app/assets/javascripts/site_validator.js.coffee b/web/app/assets/javascripts/site_validator.js.coffee index dfa89b1c4..6de951041 100644 --- a/web/app/assets/javascripts/site_validator.js.coffee +++ b/web/app/assets/javascripts/site_validator.js.coffee @@ -70,7 +70,7 @@ context.JK.SiteValidator = class SiteValidator @site_status = 'invalid' renderErrors: (errors) => - errdiv = @input_div.find('.error') + errdiv = @input_div.find('.error')[0] if errmsg = context.JK.format_errors("site", errors) @checkmark.hide() errdiv.show() diff --git a/web/spec/javascripts/fixtures/siteValidator.html.slim b/web/spec/javascripts/fixtures/siteValidator.html.slim new file mode 100644 index 000000000..783c71416 --- /dev/null +++ b/web/spec/javascripts/fixtures/siteValidator.html.slim @@ -0,0 +1,3 @@ += stylesheet_link_tag "site_validator" +div style="width:50%" + = render "clients/site_validator", site_type: 'url' diff --git a/web/spec/javascripts/fixtures/site_validator_spec.html.slim b/web/spec/javascripts/fixtures/site_validator_spec.html.slim deleted file mode 100644 index 38f630a7d..000000000 --- a/web/spec/javascripts/fixtures/site_validator_spec.html.slim +++ /dev/null @@ -1,4 +0,0 @@ -= stylesheet_link_tag "client/site_validator" -= javascript_include_tag "site_validator" -div style="width:50%" - = render "clients/site_validator", siteid: 'teaspoon' diff --git a/web/spec/javascripts/site_validator_spec.js.coffee b/web/spec/javascripts/site_validator_spec.js.coffee index d5f0d6717..066ceeab6 100644 --- a/web/spec/javascripts/site_validator_spec.js.coffee +++ b/web/spec/javascripts/site_validator_spec.js.coffee @@ -1,13 +1,12 @@ -describe "UrlValidator", -> +describe "SiteValidator", -> + + fixture.preload("siteValidator.html") beforeEach -> - this.fixtures = fixture.load("site_validator_spec.html", append=false) this.server = sinon.fakeServer.create(); window.jamClient = sinon.stub() - this.url_validator = new JK.UrlValidator($(".site_validator#teaspoon_url")) - this.url_validator.init() - $('body').append(this.site_validator.input_div) - this.site_validator.site_input.val('http://www.jamkazam.com') + @fixtures = fixture.load("siteValidator.html", true) + $('body').load(@fixtures[0]) window.gon = {} window.gon.isNativeClient = true @@ -15,5 +14,8 @@ describe "UrlValidator", -> this.server.restore(); it "displays validator widget", -> - # this.site_validator.url_input.focus() - # expect(this.site_validator.checkmark).toBeVisible() + site_validator = new JK.SiteValidator('url') + site_validator.init() + site_validator.data_input.val('http://www.jamkazam.com') + site_validator.data_input.focus() + expect(site_validator.checkmark).toBeVisible()