Extract common beforeEach() to top

Author: dmitrizagidulin

test/auth.test.js

@@ -19,18 +19,15 @@ const expect = chai.expect
 const SolidAuthOIDC = require('../src/index')
 
 describe('SolidAuthOIDC', () => {
+  var auth
+  const providerUri = 'https://provider.example.com'
+
   beforeEach(() => {
     localStorage.clear()
+    auth = new SolidAuthOIDC({ window: { location: {} }, store: localStorage })
   })
 
   describe('login()', () => {
-    let auth, providerUri
-
-    beforeEach(() => {
-      auth = new SolidAuthOIDC({ store: localStorage })
-      providerUri = 'https://provider.example.com'
-    })
-
     it('should invoke selectProvider() if provider uri is not given', () => {
       let selectProvider = sinon.stub(auth, 'selectProvider').resolves(null)
 
@@ -75,13 +72,6 @@ describe('SolidAuthOIDC', () => {
   })
 
   describe('logout()', () => {
-    let auth
-
-    beforeEach(() => {
-      localStorage.clear()
-      auth = new SolidAuthOIDC({ store: localStorage })
-    })
-
     it('should clear the current user', () => {
       let clearCurrentUser = sinon.spy(auth, 'clearCurrentUser')
 
@@ -131,12 +121,6 @@ describe('SolidAuthOIDC', () => {
   })
 
   describe('providerFromCurrentUri()', () => {
-    var auth
-    beforeEach(() => {
-      localStorage.clear()
-      auth = new SolidAuthOIDC({ window: { location: {} }, store: localStorage })
-    })
-
     it('should return null when no state param present', () => {
       auth.window.location.href = 'https://client-app.example.com'
       let providerUri = auth.providerFromCurrentUri()
@@ -166,9 +150,6 @@ describe('SolidAuthOIDC', () => {
 
   describe('provider persistence', () => {
     it('should store and load provider uri, by state', () => {
-      localStorage.clear()
-      let auth = new SolidAuthOIDC({ store: localStorage })
-      let providerUri = 'https://provider.example.com'
       let state = 'abcd'
       // Check to see that provider doesn't exist initially
       expect(auth.loadProvider(state)).to.not.exist()
@@ -182,12 +163,6 @@ describe('SolidAuthOIDC', () => {
   })
 
   describe('extractState()', () => {
-    var auth
-
-    beforeEach(() => {
-      auth = new SolidAuthOIDC()
-    })
-
     it('should return null when no uri is provided', () => {
       let state = auth.extractState()
 
@@ -227,15 +202,10 @@ describe('SolidAuthOIDC', () => {
 
   describe('selectProvider()', () => {
     it('should pass through a given providerUri', () => {
-      let auth = new SolidAuthOIDC()
-      let providerUri = 'https://provider.example.com'
-
       expect(auth.selectProvider(providerUri)).to.eventually.equal(providerUri)
     })
 
     it('should derive a provider from the current uri', () => {
-      let auth = new SolidAuthOIDC()
-      let providerUri = 'https://provider.example.com'
       auth.providerFromCurrentUri = sinon.stub().returns(providerUri)
 
       return auth.selectProvider()
@@ -246,8 +216,6 @@ describe('SolidAuthOIDC', () => {
     })
 
     it('should obtain provider from UI, if not present or cached', () => {
-      let auth = new SolidAuthOIDC()
-      let providerUri = 'https://provider.example.com'
       auth.providerFromCurrentUri = sinon.stub().returns(null)
       auth.providerFromUI = sinon.stub().resolves(providerUri)
 
@@ -260,18 +228,11 @@ describe('SolidAuthOIDC', () => {
   })
 
   describe('client persistence', () => {
-    let providerUri = 'https://provider.example.com'
     let clientConfig = { provider: { url: providerUri }}
     let mockClient = {
       provider: { url: providerUri },
       serialize: () => { return clientConfig }
     }
-    var auth
-
-    beforeEach(() => {
-      localStorage.clear()
-      auth = new SolidAuthOIDC({ store: localStorage })
-    })
 
     describe('loadClient()', () => {
       it('should throw an error if no providerUri given', () => {
@@ -320,13 +281,6 @@ describe('SolidAuthOIDC', () => {
   })
 
   describe('validateOrSendAuthRequest()', () => {
-    var auth
-
-    beforeEach(() => {
-      localStorage.clear()
-      auth = new SolidAuthOIDC({ window: { location: {} } })
-    })
-
     it('should throw an error when no client is given', () => {
       expect(auth.validateOrSendAuthRequest())
         .to.be.rejectedWith(/Could not load or register a RelyingParty client/)
@@ -360,13 +314,6 @@ describe('SolidAuthOIDC', () => {
   })
 
   describe('initUserFromResponse()', () => {
-    var auth
-
-    beforeEach(() => {
-      localStorage.clear()
-      auth = new SolidAuthOIDC({ window: { location: {} }, store: localStorage })
-    })
-
     it('should validate the auth response', () => {
       let aliceWebId = 'https://alice.example.com/'
       let authResponse = {
@@ -392,13 +339,6 @@ describe('SolidAuthOIDC', () => {
   })
 
   describe('sendAuthRequest()', () => {
-    var auth
-
-    beforeEach(() => {
-      localStorage.clear()
-      auth = new SolidAuthOIDC({ window: { location: {} }, store: localStorage })
-    })
-
     it('should compose an auth request uri, save provider, and redirect', () => {
       let state = 'abcd'
       let providerUri = 'https://provider.example.com'
@@ -420,13 +360,6 @@ describe('SolidAuthOIDC', () => {
   })
 
   describe('currentUser()', () => {
-    var auth
-
-    beforeEach(() => {
-      localStorage.clear()
-      auth = new SolidAuthOIDC({ window: { location: {} }, store: localStorage })
-    })
-
     it('should return cached webId if present', () => {
       let aliceWebId = 'https://alice.example.com'
       auth.webId = aliceWebId
@@ -457,13 +390,6 @@ describe('SolidAuthOIDC', () => {
   })
 
   describe('providerEndSessionEndpoint()', () => {
-    var auth
-
-    beforeEach(() => {
-      localStorage.clear()
-      auth = new SolidAuthOIDC({ window: { location: {} }, store: localStorage })
-    })
-
     it('should return null if no current client', () => {
       auth.currentClient = null
 
@@ -496,7 +422,7 @@ describe('SolidAuthOIDC', () => {
       expect(url).to.equal(null)
     })
 
-    it('should return null if current provider end session endpoint', () => {
+    it('should return the provider end session endpoint', () => {
       auth.currentClient = {
         provider: {
           configuration: {
@@ -513,8 +439,6 @@ describe('SolidAuthOIDC', () => {
 
   describe('clearAuthResponseFromUrl()', () => {
     it('should replace the current url with a no-hash cleared one', () => {
-      let auth = new SolidAuthOIDC()
-
       let clearedUrl = 'https://rp.com'
 
       auth.currentLocationNoHash = sinon.stub().returns(clearedUrl)