Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Commit

Permalink
Merge pull request #1478 from ONSdigital/fix-pytest-warning
Browse files Browse the repository at this point in the history
Fix pytest warning
  • Loading branch information
yoganandkunche authored Feb 28, 2018
2 parents 33d2b28 + b52532e commit 2ed5847
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 22 deletions.
12 changes: 0 additions & 12 deletions tests/app/data_model/TestSessionData.py

This file was deleted.

22 changes: 12 additions & 10 deletions tests/app/data_model/test_session_store.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
from datetime import timedelta, datetime

from mock import patch

from app.data_model.session_store import SessionStore
from app.data_model.session_data import SessionData
from tests.app.app_context_test_case import AppContextTestCase
from tests.app.data_model.TestSessionData import TestSessionData


class SessionStoreTest(AppContextTestCase):
Expand Down Expand Up @@ -69,41 +69,43 @@ def test_should_not_delete_when_no_session(self):
self.assertFalse(delete.called)

def test_session_store_ignores_new_values_in_session_data(self):
new_session_data = TestSessionData(
session_data = SessionData(
tx_id='tx_id',
eq_id='eq_id',
form_type='form_type',
period_str='period_str',
language_code=None,
survey_url=None,
ru_name='ru_name',
ru_ref='ru_ref',
additional_value='some cool new value you do not know about yet'
ru_ref='ru_ref'
)

session_data.additional_value = 'some cool new value you do not know about yet'

with self._app.test_request_context():
self.session_store.create('eq_session_id', 'test', new_session_data).save()
self.session_store.create('eq_session_id', 'test', session_data).save()

session_store = SessionStore('user_ik', 'pepper', 'eq_session_id')

self.assertFalse(hasattr(session_store.session_data, 'additional_value'))

def test_session_store_ignores_multiple_new_values_in_session_data(self):
new_session_data = TestSessionData(
session_data = SessionData(
tx_id='tx_id',
eq_id='eq_id',
form_type='form_type',
period_str='period_str',
language_code=None,
survey_url=None,
ru_name='ru_name',
ru_ref='ru_ref',
additional_value='some cool new value you do not know about yet',
second_additional_value='some other not so cool value'
ru_ref='ru_ref'
)

session_data.additional_value = 'some cool new value you do not know about yet'
session_data.second_additional_value = 'some other not so cool value'

with self._app.test_request_context():
self.session_store.create('eq_session_id', 'test', new_session_data).save()
self.session_store.create('eq_session_id', 'test', session_data).save()

session_store = SessionStore('user_ik', 'pepper', 'eq_session_id')

Expand Down

0 comments on commit 2ed5847

Please sign in to comment.