Move global beforeEach and afterEach in tests to test/_config.coffee

goodeggs · Aug 25, 2014 · 3ff9006 · 3ff9006
1 parent 190a2c2
commit 3ff9006
Show file tree

Hide file tree

Showing 27 changed files with 21 additions and 147 deletions.
diff --git a/karma.conf.coffee b/karma.conf.coffee
@@ -14,6 +14,7 @@ module.exports = (config) ->
 
       'src/index.coffee'
 
+      'test/_config.coffee'
       'test/*.test.coffee'
     ]
 

diff --git a/karma.full.conf.coffee b/karma.full.conf.coffee
@@ -15,6 +15,7 @@ module.exports = (config) ->
 
       'angular-cached-resource.js'
 
+      'test/_config.coffee'
       'test/*.test.coffee'
     ]
 

diff --git a/test/_config.coffee b/test/_config.coffee
@@ -0,0 +1,10 @@
+# This file is ran before every *.test.coffee .
+beforeEach ->
+  localStorage.clear() # TODO this should not be actually necessary
+  module('ngCachedResource')
+
+afterEach ->
+  inject ($httpBackend) ->
+    $httpBackend.verifyNoOutstandingExpectation()
+    $httpBackend.verifyNoOutstandingRequest()
+  localStorage.clear()
diff --git a/test/bound_params_nonexistent.test.coffee b/test/bound_params_nonexistent.test.coffee
@@ -2,18 +2,12 @@ describe 'bound params do not match array response', ->
   {villains, $httpBackend, $log} = {}
 
   beforeEach ->
-    module 'ngCachedResource'
     inject ($injector) ->
       $log = $injector.get '$log'
       $httpBackend = $injector.get '$httpBackend'
       $cachedResource = $injector.get '$cachedResource'
       Villain = $cachedResource('villain', '/villain/:name', { name: '@name'})
       villains = Villain.query()
-
-  afterEach ->
-    $httpBackend.verifyNoOutstandingExpectation()
-    $httpBackend.verifyNoOutstandingRequest()
-    localStorage.clear()
     $log.reset()
 
   it 'should display a warning message', ->

diff --git a/test/cache_adding.test.coffee b/test/cache_adding.test.coffee
@@ -3,17 +3,11 @@ describe 'adding resources to cache', ->
   {Computer, $httpBackend} = {}
 
   beforeEach ->
-    module('ngCachedResource')
     inject ($injector) ->
       $cachedResource = $injector.get '$cachedResource'
       $httpBackend = $injector.get '$httpBackend'
       Computer = $cachedResource 'computer', '/computer/:sn', {sn: '@sn'},
 
-  afterEach ->
-    $httpBackend.verifyNoOutstandingExpectation()
-    $httpBackend.verifyNoOutstandingRequest()
-    localStorage.clear()
-
   describe 'with a class method', ->
 
     it '$addToCache', ->

diff --git a/test/class_clear_cache.test.coffee b/test/class_clear_cache.test.coffee
@@ -2,31 +2,28 @@ describe 'CachedResource.$clearCache()', ->
   {CachedResource, $cachedResource, $httpBackend, rabbits, combos} = {}
 
   beforeEach ->
-    localStorage.clear() # TODO this should not be actually necessary
-    module('ngCachedResource')
     inject ($injector) ->
       $cachedResource = $injector.get '$cachedResource'
       $httpBackend = $injector.get '$httpBackend'
     CachedResource = $cachedResource 'class-clear-test', '/animals/:name', {name: '@name'}
 
-  afterEach ->
-    $httpBackend.verifyNoOutstandingExpectation()
-    $httpBackend.verifyNoOutstandingRequest()
-    localStorage.clear()
-
   describe 'with a populated cache', ->
-
     beforeEach ->
-      CachedResource.$addArrayToCache type: 'fictional-rabbits', [
+      CachedResource.$addArrayToCache type: 'fictional-rabbits', rabbits = [
         { name: 'white-rabbit', source: 'Alice In Wonderland' }
         { name: 'peppy-hare', source: 'Starfox' }
         { name: 'energizer-bunny', source: 'Energizer' }
         { name: 'frank', source: 'Donnie Darko' }
       ]
-      CachedResource.$addArrayToCache type: 'combos', [
+      CachedResource.$addArrayToCache type: 'combos', combos = [
         { name: 'liger', from: ['Lion', 'Tiger'] }
         { name: 'groler-bear', from: ['Grizzly Bear', 'Polar Bear'] }
       ]
+      $httpBackend.expectGET('/animals?type=fictional-rabbits').respond rabbits
+      $httpBackend.expectGET('/animals?type=combos').respond combos
+      rabbits = CachedResource.query type: 'fictional-rabbits'
+      combos = CachedResource.query type: 'combos'
+      $httpBackend.flush()
 
     it 'should remove all entries from the cache', ->
       CachedResource.$clearCache()
@@ -88,11 +85,11 @@ describe 'CachedResource.$clearCache()', ->
         $httpBackend.flush()
 
       it 'should remove all entries from the cache', ->
-        RouteResource.$clearAll()
+        RouteResource.$clearCache()
         expect(localStorage.length).to.equal 0
 
       it 'should remove all entries from the cache except for those specified by a key', ->
-        RouteResource.$clearAll exceptFor: {type: 'easy'}
+        RouteResource.$clearCache exceptFor: {type: 'easy'}
         expect(localStorage.length).to.equal 3
         expect(localStorage.getItem('cachedResource://route-resource/array?type=easy')).to.contain 1
         expect(localStorage.getItem('cachedResource://route-resource?routeId=1')).to.contain 'direct'

diff --git a/test/class_get.test.coffee b/test/class_get.test.coffee
@@ -2,17 +2,11 @@ describe 'resource instance returned by CachedResource.get', ->
   {CachedResource, $httpBackend, resourceInstance} = {}
 
   beforeEach ->
-    module('ngCachedResource')
     inject ($injector) ->
       $cachedResource = $injector.get '$cachedResource'
       $httpBackend = $injector.get '$httpBackend'
       CachedResource = $cachedResource('class-get-test', '/mock/:id')
 
-  afterEach ->
-    $httpBackend.verifyNoOutstandingExpectation()
-    $httpBackend.verifyNoOutstandingRequest()
-    localStorage.clear()
-
   describe 'when cache is empty', ->
     expectSuccessfulGET = ->
       $httpBackend.expectGET('/mock/1').respond magic: 'Here is the response'

diff --git a/test/class_get_array.test.coffee b/test/class_get_array.test.coffee
@@ -2,18 +2,12 @@ describe 'CachedResource.get array resource collections', ->
   {$httpBackend, CachedResource, resourceCollection} = {}
 
   beforeEach ->
-    module('ngCachedResource')
     inject ($injector) ->
       $cachedResource = $injector.get '$cachedResource'
       $httpBackend = $injector.get '$httpBackend'
       CachedResource = $cachedResource 'class-get-array-test', '/colors/:color',
         color: '@color'
 
-  afterEach ->
-    $httpBackend.verifyNoOutstandingExpectation()
-    $httpBackend.verifyNoOutstandingRequest()
-    localStorage.clear()
-
   describe 'when cache is empty', ->
 
     expectSuccessfulGET = ->

diff --git a/test/class_get_array_cache_populate.test.coffee b/test/class_get_array_cache_populate.test.coffee
@@ -2,17 +2,11 @@ describe 'CachedResource.get cache population from an isArray request', ->
   {$httpBackend, CachedResource} = {}
 
   beforeEach ->
-    module('ngCachedResource')
     inject ($injector) ->
       $cachedResource = $injector.get '$cachedResource'
       $httpBackend = $injector.get '$httpBackend'
       CachedResource = $cachedResource 'class-get-array-test', '/colors/:color', {color: '@color'}
 
-  afterEach ->
-    $httpBackend.verifyNoOutstandingExpectation()
-    $httpBackend.verifyNoOutstandingRequest()
-    localStorage.clear()
-
   describe 'when cache is populated by a parameterless query', ->
     beforeEach ->
       $httpBackend.expectGET('/colors').respond [

diff --git a/test/class_get_array_callback.test.coffee b/test/class_get_array_callback.test.coffee
@@ -2,18 +2,12 @@ describe 'CachedResource.get array resource collections with callback', ->
   {$httpBackend, CachedResource} = {}
 
   beforeEach ->
-    module('ngCachedResource')
     inject ($injector) ->
       $cachedResource = $injector.get '$cachedResource'
       $httpBackend = $injector.get '$httpBackend'
       CachedResource = $cachedResource 'class-get-array-callback-test', '/colors/:color',
         color: '@color'
 
-  afterEach ->
-    $httpBackend.verifyNoOutstandingExpectation()
-    $httpBackend.verifyNoOutstandingRequest()
-    localStorage.clear()
-
   it 'only calls the callback once', ->
     $httpBackend.expectGET('/colors').respond [
       { color: 'red', hex: '#FF0000' }

diff --git a/test/class_get_without_params.test.coffee b/test/class_get_without_params.test.coffee
@@ -2,17 +2,11 @@ describe 'CachedResource.get without params', ->
   {$httpBackend, CachedResource} = {}
 
   beforeEach ->
-    module('ngCachedResource')
     inject ($injector) ->
       $cachedResource = $injector.get '$cachedResource'
       $httpBackend = $injector.get '$httpBackend'
       CachedResource = $cachedResource('class-paramless-test', '/monster')
 
-  afterEach ->
-    $httpBackend.verifyNoOutstandingExpectation()
-    $httpBackend.verifyNoOutstandingRequest()
-    localStorage.clear()
-
   it 'should call the callback after it makes the initial request', (done) ->
     $httpBackend.expectGET('/monster').respond {sound: 'rarrrr'}
     CachedResource.get (response) ->

diff --git a/test/class_post.test.coffee b/test/class_post.test.coffee
@@ -2,18 +2,12 @@ describe 'CachedResource.post', ->
   {CachedResource, $httpBackend, $timeout} = {}
 
   beforeEach ->
-    module('ngCachedResource')
     inject ($injector) ->
       $cachedResource = $injector.get '$cachedResource'
       $httpBackend = $injector.get '$httpBackend'
       $timeout = $injector.get '$timeout'
       CachedResource = $cachedResource 'class-save-test', '/mock/:id'
 
-  afterEach ->
-    $httpBackend.verifyNoOutstandingExpectation()
-    $httpBackend.verifyNoOutstandingRequest()
-    localStorage.clear()
-
   describe 'while online', ->
     it 'saves the resource normally', (done) ->
       $httpBackend.expectPOST('/mock/1', magic: 'This is a saved resource').respond

diff --git a/test/class_with_custom_actions.test.coffee b/test/class_with_custom_actions.test.coffee
@@ -2,7 +2,6 @@ describe 'class with custom actions', ->
   {CachedResource, $httpBackend} = {}
 
   beforeEach ->
-    module('ngCachedResource')
     inject ($injector) ->
       $cachedResource = $injector.get '$cachedResource'
       $httpBackend = $injector.get '$httpBackend'
@@ -12,11 +11,6 @@ describe 'class with custom actions', ->
         kiai:
           method: "put"
 
-  afterEach ->
-    $httpBackend.verifyNoOutstandingExpectation()
-    $httpBackend.verifyNoOutstandingRequest()
-    localStorage.clear()
-
   it "has default actions", ->
     for action in ['get', 'query', 'save', 'remove', 'delete']
       expect( CachedResource ).to.have.property action

diff --git a/test/class_writes_then_reads.test.coffee b/test/class_writes_then_reads.test.coffee
@@ -2,17 +2,11 @@ describe 'Class writes, then reads', ->
   {CachedResource, $httpBackend} = {}
 
   beforeEach ->
-    module('ngCachedResource')
     inject ($injector) ->
       $cachedResource = $injector.get '$cachedResource'
       $httpBackend = $injector.get '$httpBackend'
       CachedResource = $cachedResource 'class-writes-then-reads-test', '/mock/:id', {id: '@id'}
 
-  afterEach ->
-    $httpBackend.verifyNoOutstandingExpectation()
-    $httpBackend.verifyNoOutstandingRequest()
-    localStorage.clear()
-
   describe 'when the write was unsuccessful', ->
     beforeEach ->
       $httpBackend.expectPOST('/mock/1').respond 503

diff --git a/test/custom_actions_with_additional_url_params.test.coffee b/test/custom_actions_with_additional_url_params.test.coffee
@@ -2,7 +2,6 @@ describe 'custom actions with addtional URL parameters', ->
   {Group, $httpBackend} = {}
 
   beforeEach ->
-    module('ngCachedResource')
     inject ($injector) ->
       $cachedResource = $injector.get '$cachedResource'
       $httpBackend = $injector.get '$httpBackend'
@@ -11,11 +10,6 @@ describe 'custom actions with addtional URL parameters', ->
           method: "PUT"
           url: '/contacts/:contactId/groups/:id'
 
-  afterEach ->
-    $httpBackend.verifyNoOutstandingExpectation()
-    $httpBackend.verifyNoOutstandingRequest()
-    localStorage.clear()
-
   it 'sends a request to the custom URL', ->
     $httpBackend.expectPUT('/contacts/C-3PO/groups/cybot_galactica', { id: 'cybot_galactica', location: 'Etti IV'}).respond 200
     Group.saveByContact { contactId: 'C-3PO' }, { id: 'cybot_galactica', location: 'Etti IV' }

diff --git a/test/disable_cache.test.coffee b/test/disable_cache.test.coffee
@@ -2,19 +2,13 @@ describe 'disabling cache for certain actions', ->
   {Goat, $httpBackend} = {}
 
   beforeEach ->
-    module('ngCachedResource')
     inject ($injector) ->
       $cachedResource = $injector.get '$cachedResource'
       $httpBackend = $injector.get '$httpBackend'
       Goat = $cachedResource 'disable-cache-test', '/goats/:name', {name: '@name'},
         bleat: { url: '/goats/:name/bleat', method: 'PUT', cache: off }
         kick: { url: '/goats/:name/kick', method: 'PUT' }
 
-  afterEach ->
-    $httpBackend.verifyNoOutstandingExpectation()
-    $httpBackend.verifyNoOutstandingRequest()
-    localStorage.clear()
-
   describe 'Goat class', ->
     it 'does not cache when bleating', ->
       $httpBackend.expectPUT('/goats/houdini/bleat').respond 500

diff --git a/test/existing_write_queue.test.coffee b/test/existing_write_queue.test.coffee
@@ -5,17 +5,11 @@ describe 'an existing write queue', ->
     localStorage.setItem 'cachedResource://existing-write-queue-test/write', angular.toJson [{params: {id: 1}, resourceParams: {id: 1}, action: 'save'}]
     localStorage.setItem 'cachedResource://existing-write-queue-test?id=1', angular.toJson value: magic: 'from the cache'
 
-    module('ngCachedResource')
     inject ($injector) ->
       $cachedResource = $injector.get '$cachedResource'
       $httpBackend = $injector.get '$httpBackend'
       $timeout = $injector.get '$timeout'
 
-  afterEach ->
-    localStorage.clear()
-    $httpBackend.verifyNoOutstandingExpectation()
-    $httpBackend.verifyNoOutstandingRequest()
-
   it 'saves the item that was stored in the cache', ->
     $httpBackend.expectPOST('/mock/1', magic: 'from the cache').respond 200
     $cachedResource 'existing-write-queue-test', '/mock/:id'

diff --git a/test/full_local_storage_cache.test.coffee b/test/full_local_storage_cache.test.coffee
@@ -15,16 +15,13 @@ conditionallyDescribe 'a full localStorage cache', ->
 
   beforeEach ->
     sinon.stub(window.localStorage, 'setItem').throws 'QuotaExceededError'
-    module('ngCachedResource')
     inject ($injector) ->
       $cachedResource = $injector.get '$cachedResource'
       $httpBackend = $injector.get '$httpBackend'
       CachedResource = $cachedResource 'full-local-storage-cache', '/mock/:id', id: '@id'
 
   afterEach ->
     window.localStorage.setItem.restore()
-    $httpBackend.verifyNoOutstandingExpectation()
-    $httpBackend.verifyNoOutstandingRequest()
 
   it 'still succeeds at GET requests', ->
     $httpBackend.expectGET('/mock/42').respond question: 'The ultimate question of life, the universe, and everything'

diff --git a/test/global_clear_cache.test.coffee b/test/global_clear_cache.test.coffee
@@ -2,16 +2,10 @@ describe '$cachedResource.clearCache()', ->
   {$cachedResource, $httpBackend} = {}
 
   beforeEach ->
-    module('ngCachedResource')
     inject ($injector) ->
       $cachedResource = $injector.get '$cachedResource'
       $httpBackend = $injector.get '$httpBackend'
 
-  afterEach ->
-    $httpBackend.verifyNoOutstandingExpectation()
-    $httpBackend.verifyNoOutstandingRequest()
-    localStorage.clear()
-
   describe 'with a populated cache', ->
 
     beforeEach ->

diff --git a/test/global_clear_undefined.test.coffee b/test/global_clear_undefined.test.coffee
@@ -2,16 +2,10 @@ describe '$cachedResource.clearUndefined()', ->
   {$cachedResource, $httpBackend} = {}
 
   beforeEach ->
-    module('ngCachedResource')
     inject ($injector) ->
       $cachedResource = $injector.get '$cachedResource'
       $httpBackend = $injector.get '$httpBackend'
 
-  afterEach ->
-    $httpBackend.verifyNoOutstandingExpectation()
-    $httpBackend.verifyNoOutstandingRequest()
-    localStorage.clear()
-
   describe 'with an item corresponding to a resource in the cache', ->
 
     beforeEach ->

diff --git a/test/instance_post.test.coffee b/test/instance_post.test.coffee
@@ -2,19 +2,13 @@ describe 'CachedResource::post', ->
   {resourceInstance, $httpBackend, $timeout} = {}
 
   beforeEach ->
-    module('ngCachedResource')
     inject ($injector) ->
       $cachedResource = $injector.get '$cachedResource'
       $httpBackend = $injector.get '$httpBackend'
       $timeout = $injector.get '$timeout'
       CachedResource = $cachedResource 'instance-post-test', '/mock/:id', {id: '@id'}
       resourceInstance = new CachedResource id: 1, notes: 'this is a saved note', list: [1,2,3]
 
-  afterEach ->
-    $httpBackend.verifyNoOutstandingExpectation()
-    $httpBackend.verifyNoOutstandingRequest()
-    localStorage.clear()
-
   describe 'while online', ->
     it 'POSTS the entire body of the resource', ->
       $httpBackend.expectPOST('/mock/1', { id: 1, notes: 'this is a saved note', list: [1,2,3] }).respond 200