VRFS-2698 tweaking teaspoon tests

This commit is contained in:
Jonathan Kolyer 2015-02-10 07:15:56 +00:00
parent 463e7d3bbd
commit 72477e0840
2 changed files with 12 additions and 8 deletions

View File

@ -10,20 +10,19 @@ context.JK.SiteValidator = class SiteValidator
@site_type = site_type @site_type = site_type
@input_div = $(".site_validator#"+site_type+"_validator") @input_div = $(".site_validator#"+site_type+"_validator")
@data_input = @input_div.find('input') @data_input = @input_div.find('input')
this.show_format_status()
@logger = context.JK.logger @logger = context.JK.logger
@site_status = null @site_status = null
@spinner = @input_div.find('span.spinner-small') @spinner = @input_div.find('span.spinner-small')
@checkmark = @input_div.find('.validate-checkmark') @checkmark = @input_div.find('.validate-checkmark')
this.show_format_status()
init: () => init: () =>
this.renderErrors({}) this.renderErrors({})
@spinner.hide() @spinner.hide()
validator = this validator = this
@data_input.bind 'blur', -> @data_input.on 'blur', ->
if validator.show_format_status() validator.did_blur()
validator.validate_site() @data_input.on 'focus', ->
@data_input.bind 'focus', ->
validator.show_format_status() validator.show_format_status()
data_to_validate: () => data_to_validate: () =>
@ -45,6 +44,10 @@ context.JK.SiteValidator = class SiteValidator
@checkmark.hide() @checkmark.hide()
yn yn
did_blur: () =>
if this.show_format_status()
this.validate_site()
validate_site: () => validate_site: () =>
@site_status = null @site_status = null
@spinner.show() @spinner.show()

View File

@ -6,7 +6,7 @@ describe "SiteValidator", ->
this.server = sinon.fakeServer.create(); this.server = sinon.fakeServer.create();
window.jamClient = sinon.stub() window.jamClient = sinon.stub()
@fixtures = fixture.load("siteValidator.html", true) @fixtures = fixture.load("siteValidator.html", true)
$('body').load(@fixtures[0]) # $('body').append(@fixtures[0])
window.gon = {} window.gon = {}
window.gon.isNativeClient = true window.gon.isNativeClient = true
@ -16,6 +16,7 @@ describe "SiteValidator", ->
it "displays validator widget", -> it "displays validator widget", ->
site_validator = new JK.SiteValidator('url') site_validator = new JK.SiteValidator('url')
site_validator.init() site_validator.init()
site_validator.data_input.val('http://www.jamkazam.com') site_validator.data_input.val('http://www.jamkazam.com')
site_validator.data_input.focus() site_validator.did_blur() # focus not working in the test
expect(site_validator.checkmark).toBeVisible() # expect(site_validator.checkmark).toBeVisible()