diff --git a/app/assets/javascripts/src/Metamaps.Import.js b/app/assets/javascripts/src/Metamaps.Import.js index 159298b8..e82a05c5 100644 --- a/app/assets/javascripts/src/Metamaps.Import.js +++ b/app/assets/javascripts/src/Metamaps.Import.js @@ -320,5 +320,3 @@ Metamaps.Import = { Metamaps.Synapse.renderSynapse(mapping, synapse, node1, node2, true) } } - -module.exports = Metamaps.Import diff --git a/app/assets/javascripts/test/Metamaps.Import.spec.js b/app/assets/javascripts/test/Metamaps.Import.spec.js index d8993e42..cf8d6f53 100644 --- a/app/assets/javascripts/test/Metamaps.Import.spec.js +++ b/app/assets/javascripts/test/Metamaps.Import.spec.js @@ -1,11 +1,12 @@ -var chai = require('chai') -var expect = chai.expect +/* global describe, it */ +const chai = require('chai') +const expect = chai.expect -Metamaps = {} -Metamaps.Import = require('../src/Metamaps.Import') +const Metamaps = {} +require('../src/Metamaps.Import') -describe('Metamaps.Import.js', function() { - it('has a topic whitelist', function() { +describe('Metamaps.Import.js', function () { + it('has a topic whitelist', function () { expect(Metamaps.Import.topicWhitelist).to.deep.equal( ['id', 'name', 'metacode', 'x', 'y', 'description', 'link', 'permission'] ) diff --git a/app/policies/mapping_policy.rb b/app/policies/mapping_policy.rb index 5826ccd4..ce8522df 100644 --- a/app/policies/mapping_policy.rb +++ b/app/policies/mapping_policy.rb @@ -16,7 +16,7 @@ class MappingPolicy < ApplicationPolicy end def show? - map_policy.show? && mappable_policy.show? + map_policy.show? && mappable_policy.try(:show?) end def create?