fixed broken JS specs
Merge pull request #224 from diogob/fix_js_spec

fixed broken JS specs
Merge branch 'master' into rails-4