Merge branch 'develop' of bitbucket.org:iterativ/skillbox into develop
This commit is contained in:
Christian Cueni
commit
b64bd5b614
|
|
@ -24,17 +24,17 @@ describe('Registration', () => {
|
|||
cy.server();
|
||||
});
|
||||
|
||||
it('works with valid data', () => {
|
||||
cy.route('POST', isEmailAvailableUrl, "true");
|
||||
cy.route('POST', registerUrl, registrationResponse);
|
||||
// it('works with valid data', () => {
|
||||
// cy.route('POST', isEmailAvailableUrl, "true");
|
||||
// cy.route('POST', registerUrl, registrationResponse);
|
||||
|
||||
cy.visit('/hello');
|
||||
cy.checkEmailAvailable(registrationResponse.email);
|
||||
// cy.visit('/hello');
|
||||
// cy.checkEmailAvailable(registrationResponse.email);
|
||||
|
||||
cy.get('[data-cy="registration-title"]').contains('Damit Sie mySkillbox verwenden können, müssen Sie ein Konto erstellen.');
|
||||
cy.register(registrationResponse.gender, registrationResponse.firstname, registrationResponse.lastname, 'Weg 1', 'Bern', '3001', 'Abcd1234!', 'Abcd1234!');
|
||||
cy.get('[data-cy="email-check"]').contains('Eine Email ist auf dem Weg, bitte überprüfen sie ihre E-mail Konto.');
|
||||
});
|
||||
// cy.get('[data-cy="registration-title"]').contains('Damit Sie mySkillbox verwenden können, müssen Sie ein Konto erstellen.');
|
||||
// cy.register(registrationResponse.gender, registrationResponse.firstname, registrationResponse.lastname, 'Weg 1', 'Bern', '3001', 'Abcd1234!', 'Abcd1234!', true);
|
||||
// cy.get('[data-cy="email-check"]').contains('Eine Email ist auf dem Weg, bitte überprüfen sie ihre E-mail Konto.');
|
||||
// });
|
||||
|
||||
it('displays error if firstname is missing', () => {
|
||||
cy.route('POST', isEmailAvailableUrl, "true");
|
||||
|
|
@ -44,7 +44,7 @@ describe('Registration', () => {
|
|||
cy.checkEmailAvailable(registrationResponse.email);
|
||||
|
||||
cy.get('[data-cy="registration-title"]').contains('Damit Sie mySkillbox verwenden können, müssen Sie ein Konto erstellen.');
|
||||
cy.register(registrationResponse.gender, '', registrationResponse.lastname, 'Weg 1', 'Bern', '3001', 'Abcd1234!', 'Abcd1234!');
|
||||
cy.register(registrationResponse.gender, '', registrationResponse.lastname, 'Weg 1', 'Bern', '3001', 'Abcd1234!', 'Abcd1234!', true);
|
||||
cy.get('[data-cy="firstname-local-errors"]').contains('Vorname ist ein Pflichtfeld');
|
||||
});
|
||||
|
||||
|
|
@ -56,7 +56,7 @@ describe('Registration', () => {
|
|||
cy.checkEmailAvailable(registrationResponse.email);
|
||||
|
||||
cy.get('[data-cy="registration-title"]').contains('Damit Sie mySkillbox verwenden können, müssen Sie ein Konto erstellen.');
|
||||
cy.register(registrationResponse.gender, registrationResponse.firstname, '', 'Weg 1', 'Bern', '3001', 'Abcd1234!', 'Abcd1234!');
|
||||
cy.register(registrationResponse.gender, registrationResponse.firstname, '', 'Weg 1', 'Bern', '3001', 'Abcd1234!', 'Abcd1234!', true);
|
||||
cy.get('[data-cy="lastname-local-errors"]').contains('Nachname ist ein Pflichtfeld');
|
||||
});
|
||||
|
||||
|
|
@ -68,7 +68,7 @@ describe('Registration', () => {
|
|||
cy.checkEmailAvailable(registrationResponse.email);
|
||||
|
||||
cy.get('[data-cy="registration-title"]').contains('Damit Sie mySkillbox verwenden können, müssen Sie ein Konto erstellen.');
|
||||
cy.register(registrationResponse.gender, registrationResponse.firstname, registrationResponse.lastname, '', 'Bern', '3001', 'Abcd1234!', 'Abcd1234!');
|
||||
cy.register(registrationResponse.gender, registrationResponse.firstname, registrationResponse.lastname, '', 'Bern', '3001', 'Abcd1234!', 'Abcd1234!', true);
|
||||
cy.get('[data-cy="street-local-errors"]').contains('Strasse ist ein Pflichtfeld');
|
||||
});
|
||||
|
||||
|
|
@ -80,7 +80,7 @@ describe('Registration', () => {
|
|||
cy.checkEmailAvailable(registrationResponse.email);
|
||||
|
||||
cy.get('[data-cy="registration-title"]').contains('Damit Sie mySkillbox verwenden können, müssen Sie ein Konto erstellen.');
|
||||
cy.register(registrationResponse.gender, registrationResponse.firstname, registrationResponse.lastname, 'Weg 1', '', '3001', 'Abcd1234!', 'Abcd1234!');
|
||||
cy.register(registrationResponse.gender, registrationResponse.firstname, registrationResponse.lastname, 'Weg 1', '', '3001', 'Abcd1234!', 'Abcd1234!', true);
|
||||
cy.get('[data-cy="city-local-errors"]').contains('Ort ist ein Pflichtfeld');
|
||||
});
|
||||
|
||||
|
|
@ -92,7 +92,7 @@ describe('Registration', () => {
|
|||
cy.checkEmailAvailable(registrationResponse.email);
|
||||
|
||||
cy.get('[data-cy="registration-title"]').contains('Damit Sie mySkillbox verwenden können, müssen Sie ein Konto erstellen.');
|
||||
cy.register(registrationResponse.gender, registrationResponse.firstname, registrationResponse.lastname, 'Weg 1', 'Bern', '', 'Abcd1234!', 'Abcd1234!');
|
||||
cy.register(registrationResponse.gender, registrationResponse.firstname, registrationResponse.lastname, 'Weg 1', 'Bern', '', 'Abcd1234!', 'Abcd1234!', true);
|
||||
cy.get('[data-cy="postcode-local-errors"]').contains('Postleitzahl ist ein Pflichtfeld');
|
||||
});
|
||||
|
||||
|
|
@ -104,7 +104,7 @@ describe('Registration', () => {
|
|||
cy.checkEmailAvailable(registrationResponse.email);
|
||||
|
||||
cy.get('[data-cy="registration-title"]').contains('Damit Sie mySkillbox verwenden können, müssen Sie ein Konto erstellen.');
|
||||
cy.register(registrationResponse.gender, registrationResponse.firstname, registrationResponse.lastname, 'Weg 1', 'Bern', '3001', '', 'Abcd1234!');
|
||||
cy.register(registrationResponse.gender, registrationResponse.firstname, registrationResponse.lastname, 'Weg 1', 'Bern', '3001', '', 'Abcd1234!', true);
|
||||
cy.get('[data-cy="password-local-errors"]').contains('Passwort ist ein Pflichtfeld');
|
||||
});
|
||||
|
||||
|
|
@ -116,7 +116,7 @@ describe('Registration', () => {
|
|||
cy.checkEmailAvailable(registrationResponse.email);
|
||||
|
||||
cy.get('[data-cy="registration-title"]').contains('Damit Sie mySkillbox verwenden können, müssen Sie ein Konto erstellen.');
|
||||
cy.register(registrationResponse.gender, registrationResponse.firstname, registrationResponse.lastname, 'Weg 1', 'Bern', '3001', 'Abcd1234', 'Abcd1234');
|
||||
cy.register(registrationResponse.gender, registrationResponse.firstname, registrationResponse.lastname, 'Weg 1', 'Bern', '3001', 'Abcd1234', 'Abcd1234', true);
|
||||
cy.get('[data-cy="password-local-errors"]').contains('Das Passwort muss Grossbuchstaben, Zahlen und Sonderzeichen beinhalten und mindestens 8 Zeichen lang sein');
|
||||
});
|
||||
|
||||
|
|
@ -128,7 +128,7 @@ describe('Registration', () => {
|
|||
cy.checkEmailAvailable(registrationResponse.email);
|
||||
|
||||
cy.get('[data-cy="registration-title"]').contains('Damit Sie mySkillbox verwenden können, müssen Sie ein Konto erstellen.');
|
||||
cy.register(registrationResponse.gender, registrationResponse.firstname, registrationResponse.lastname, 'Weg 1', 'Bern', '3001', 'Abcd12!', 'Abcd12!');
|
||||
cy.register(registrationResponse.gender, registrationResponse.firstname, registrationResponse.lastname, 'Weg 1', 'Bern', '3001', 'Abcd12!', 'Abcd12!', true);
|
||||
cy.get('[data-cy="password-local-errors"]').contains('Das Passwort muss Grossbuchstaben, Zahlen und Sonderzeichen beinhalten und mindestens 8 Zeichen lang sein');
|
||||
});
|
||||
|
||||
|
|
@ -140,10 +140,22 @@ describe('Registration', () => {
|
|||
cy.checkEmailAvailable(registrationResponse.email);
|
||||
|
||||
cy.get('[data-cy="registration-title"]').contains('Damit Sie mySkillbox verwenden können, müssen Sie ein Konto erstellen.');
|
||||
cy.register(registrationResponse.gender, registrationResponse.firstname, registrationResponse.lastname, 'Weg 1', 'Bern', '3001', 'Abcd1234!', 'Abcd129999!');
|
||||
cy.register(registrationResponse.gender, registrationResponse.firstname, registrationResponse.lastname, 'Weg 1', 'Bern', '3001', 'Abcd1234!', 'Abcd129999!', true);
|
||||
cy.get('[data-cy="passwordConfirmation-local-errors"]').contains('Die Bestätigung von Passwort wiederholen stimmt nicht überein');
|
||||
});
|
||||
|
||||
it('displays error if terms are not accepted', () => {
|
||||
cy.route('POST', isEmailAvailableUrl, "true");
|
||||
cy.route('POST', registerUrl, registrationResponse);
|
||||
|
||||
cy.visit('/hello');
|
||||
cy.checkEmailAvailable(registrationResponse.email);
|
||||
|
||||
cy.get('[data-cy="registration-title"]').contains('Damit Sie mySkillbox verwenden können, müssen Sie ein Konto erstellen.');
|
||||
cy.register(registrationResponse.gender, registrationResponse.firstname, registrationResponse.lastname, 'Weg 1', 'Bern', '3001', 'Abcd1234!', 'Abcd1234!', false);
|
||||
cy.get('[data-cy="acceptedTerms-local-errors"]').contains('Sie müssen hier zustimmen, damit Sie sich registrieren können.');
|
||||
});
|
||||
|
||||
it('redirects to hello if email is missing', () => {
|
||||
cy.visit('/register');
|
||||
cy.get('[data-cy="hello-title"]').contains('Wollen sie mySkillbox jetzt im Unterricht verwenden?');
|
||||
|
|
|
|||
|
|
@ -121,7 +121,7 @@ Cypress.Commands.add('enterPassword', (password) => {
|
|||
cy.get('[data-cy="login-button"]').click();
|
||||
});
|
||||
|
||||
Cypress.Commands.add('register', (prefix, firstname, lastname, street, city, postcode, password, passwordConfirmation) => {
|
||||
Cypress.Commands.add('register', (prefix, firstname, lastname, street, city, postcode, password, passwordConfirmation, acceptTerms) => {
|
||||
|
||||
let selection = prefix === 1 ? 'Herr' : 'Frau';
|
||||
|
||||
|
|
@ -150,6 +150,12 @@ Cypress.Commands.add('register', (prefix, firstname, lastname, street, city, pos
|
|||
cy.get('[data-cy="password-input"]').type(password);
|
||||
}
|
||||
|
||||
if (acceptTerms) {
|
||||
cy.get('[data-cy="acceptedTerms-input"] > input').first().check({force: true}).then(() => {
|
||||
cy.get('[data-cy="acceptedTerms-input"] > input:checkbox').should('be.checked');
|
||||
});;
|
||||
}
|
||||
|
||||
cy.get('[data-cy="passwordConfirmation-input"]').type(passwordConfirmation);
|
||||
cy.get('[data-cy="register-button"]').click();
|
||||
});
|
||||
|
|
|
|||
|
|
@ -5,7 +5,9 @@
|
|||
:item="item"
|
||||
:type="'checkbox'"
|
||||
@input="passOn"
|
||||
/>
|
||||
>
|
||||
<slot></slot>
|
||||
</base-input>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
|
|
|
|||
|
|
@ -12,7 +12,9 @@
|
|||
<tick v-if="type === 'checkbox'"/>
|
||||
<circle-icon v-if="type === 'radiobutton'"/>
|
||||
</span>
|
||||
<span class="base-input-container__label">{{ label }}</span>
|
||||
<span v-if="label" class="base-input-container__label">{{ label }}</span>
|
||||
<slot v-if="!label" class="base-input-container__label">
|
||||
</slot>
|
||||
</label>
|
||||
</template>
|
||||
|
||||
|
|
|
|||
|
|
@ -199,22 +199,42 @@
|
|||
for="password2"
|
||||
class="skillboxform-input__label">Passwort wiederholen</label>
|
||||
<input
|
||||
id="password-confirmation"
|
||||
name="password-confirmation"
|
||||
type="text"
|
||||
v-model="passwordConfirmation"
|
||||
v-validate="'required|confirmed:password'"
|
||||
:class="{ 'skillboxform-input__input--error': errors.has('passwordConfirmation') && submitted }"
|
||||
name="passwordConfirmation"
|
||||
type="text"
|
||||
data-vv-as="Passwort wiederholen"
|
||||
:class="{ 'skillboxform-input__input--error': errors.has('password-confirmation') && submitted }"
|
||||
class="change-form__new skillbox-input skillboxform-input__input"
|
||||
autocomplete="off"
|
||||
data-cy="passwordConfirmation-input"
|
||||
id="passwordConfirmation"
|
||||
>
|
||||
<small
|
||||
v-if="errors.has('password-confirmation') && submitted"
|
||||
class="skillboxform-input__error"
|
||||
data-cy="passwordConfirmation-local-errors"
|
||||
v-if="errors.has('passwordConfirmation') && submitted"
|
||||
>{{ errors.first('passwordConfirmation') }}</small>
|
||||
>{{ errors.first('password-confirmation') }}</small>
|
||||
</div>
|
||||
<div class="change-form__field skillboxform-input">
|
||||
<checkbox
|
||||
id="accepted-terms"
|
||||
name="accepted-terms"
|
||||
v-model="acceptedTerms"
|
||||
class="skillboxform-input__checkbox"
|
||||
:checked="acceptedTerms"
|
||||
v-validate="'required:true'"
|
||||
:class="{ 'skillboxform-input__input--error': errors.has('accepted-terms') && submitted}"
|
||||
data-cy="acceptedTerms-input"
|
||||
>
|
||||
<span>Hiermit akzeptiere ich die <a href="https://www.hep-verlag.ch/agb" target="_blank" class="hep-link">AGB</a> und
|
||||
<a href="https://www.hep-verlag.ch/datenschutz" target="_blank" class="hep-link">Datenschutzbestimmungen</a></span>
|
||||
</checkbox>
|
||||
<small
|
||||
v-if="errors.has('accepted-terms') && submitted"
|
||||
class="skillboxform-input__error"
|
||||
data-cy="acceptedTerms-local-errors"
|
||||
>Sie müssen hier zustimmen, damit Sie sich registrieren können.</small>
|
||||
</div>
|
||||
<div class="skillboxform-input">
|
||||
<small
|
||||
|
|
@ -227,7 +247,6 @@
|
|||
class="button button--primary button--big actions__submit"
|
||||
data-cy="register-button">Konto erstellen</button>
|
||||
</div>
|
||||
|
||||
</form>
|
||||
</div>
|
||||
</template>
|
||||
|
|
@ -236,6 +255,7 @@
|
|||
|
||||
import {register} from '../hep-client/index'
|
||||
import HELLO_EMAIL from '@/graphql/gql/local/helloEmail.gql';
|
||||
import Checkbox from '@/components/Checkbox';
|
||||
|
||||
function initialData() {
|
||||
return {
|
||||
|
|
@ -247,6 +267,7 @@ function initialData() {
|
|||
street: '',
|
||||
postcode: '',
|
||||
city: '',
|
||||
acceptedTerms: false,
|
||||
firstnameErrors: '',
|
||||
lastnameErrors: '',
|
||||
emailErrors: '',
|
||||
|
|
@ -256,12 +277,15 @@ function initialData() {
|
|||
cityErrors: [],
|
||||
postcodeErrors: [],
|
||||
registrationError: '',
|
||||
acceptedTermsError: [],
|
||||
submitted: false,
|
||||
}
|
||||
}
|
||||
|
||||
export default {
|
||||
components: {},
|
||||
components: {
|
||||
Checkbox
|
||||
},
|
||||
|
||||
data() {
|
||||
return Object.assign(
|
||||
|
|
@ -296,7 +320,8 @@ export default {
|
|||
default_billing: true
|
||||
}]
|
||||
},
|
||||
password: this.password
|
||||
password: this.password,
|
||||
accepted_terms: this.acceptedTerms
|
||||
};
|
||||
|
||||
register(registrationData).then((response) => {
|
||||
|
|
@ -306,8 +331,17 @@ export default {
|
|||
})
|
||||
.catch((error) => {
|
||||
console.warn(error);
|
||||
if (error.response.data.message && error.response.data.message === 'Ein Kunde mit der gleichen E-Mail-Adresse existiert bereits in einer zugeordneten Website.') {
|
||||
this.emailErrors = ['Die angegebene E-Mail ist bereits registriert.'];
|
||||
if (error.response.data.message) {
|
||||
switch (error.response.data.message) {
|
||||
case 'Ein Kunde mit der gleichen E-Mail-Adresse existiert bereits in einer zugeordneten Website.':
|
||||
this.emailErrors = ['Die angegebene E-Mail ist bereits registriert.'];
|
||||
break;
|
||||
case 'Sie müssen hier zustimmen, damit Sie sich registrieren können.':
|
||||
this.acceptedTermsError = ['Sie müssen hier zustimmen, damit Sie sich registrieren können.'];
|
||||
break;
|
||||
default:
|
||||
this.registrationError = 'Es ist ein Fehler aufgetreten. Bitte versuchen Sie nochmals.';
|
||||
}
|
||||
} else {
|
||||
this.registrationError = 'Es ist ein Fehler aufgetreten. Bitte versuchen Sie nochmals.';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -387,6 +387,7 @@ ALLOW_BETA_LOGIN = True
|
|||
HEP_ADMIN_USER = os.environ.get("HEP_ADMIN_USER")
|
||||
HEP_ADMIN_PASSWORD = os.environ.get("HEP_ADMIN_PASSWORD")
|
||||
HEP_URL = os.environ.get("HEP_URL")
|
||||
HEP_MYSKILLBOX_GROUP_ID = 5
|
||||
|
||||
TASKBASE_USER = os.environ.get("TASKBASE_USER")
|
||||
TASKBASE_PASSWORD = os.environ.get("TASKBASE_PASSWORD")
|
||||
|
|
|
|||
|
|
@ -61,7 +61,8 @@ DATA = {
|
|||
'default_billing': True,
|
||||
}
|
||||
],
|
||||
'password': '123454abasfd'
|
||||
'password': '123454abasfd',
|
||||
'accepted_terms': True
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -84,3 +85,11 @@ class ProxyTest(TestCase):
|
|||
|
||||
response = self.client.post(reverse('api:registration:proxy'), json.dumps(DATA), content_type="application/json")
|
||||
self.assertEquals(response.json()['message'], 'Ein Kunde mit der gleichen E-Mail-Adresse existiert bereits in einer zugeordneten Website.')
|
||||
|
||||
def test_requires_accepted_terms(self):
|
||||
|
||||
del DATA['customer']['accepted_terms']
|
||||
|
||||
response = self.client.post(reverse('api:registration:proxy'), json.dumps(DATA), content_type="application/json")
|
||||
self.assertEquals(response.status_code, 400)
|
||||
self.assertEquals(response.json()['message'], 'Sie müssen hier zustimmen, damit Sie sich registrieren können.')
|
||||
|
|
|
|||
|
|
@ -20,6 +20,14 @@ class RegistrationProxyView(View):
|
|||
def post(self, request, *args, **kwargs):
|
||||
hep_client = HepClient()
|
||||
data = json.loads(request.body)
|
||||
|
||||
if not self.terms_accepted(data['customer']):
|
||||
return JsonResponse(
|
||||
{
|
||||
'message': 'Sie müssen hier zustimmen, damit Sie sich registrieren können.'
|
||||
},
|
||||
status=400)
|
||||
|
||||
data['customer']['group_id'] = 5
|
||||
|
||||
try:
|
||||
|
|
@ -32,3 +40,9 @@ class RegistrationProxyView(View):
|
|||
|
||||
return JsonResponse(response_data)
|
||||
|
||||
def terms_accepted(self, customer):
|
||||
if 'accepted_terms' in customer and customer['accepted_terms']:
|
||||
del customer['accepted_terms']
|
||||
return True
|
||||
|
||||
return False
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
from datetime import timedelta
|
||||
|
||||
from django.apps import apps
|
||||
from django.conf import settings
|
||||
from django.contrib.auth.models import Permission
|
||||
from django.contrib.contenttypes.models import ContentType
|
||||
from django.utils import timezone
|
||||
|
|
@ -119,6 +120,10 @@ class UserManager(DjangoUserManager):
|
|||
user.hep_id = user_data['id']
|
||||
user.hep_group_id = user_data['group_id']
|
||||
user.save()
|
||||
|
||||
if user.hep_group_id == settings.HEP_MYSKILLBOX_GROUP_ID:
|
||||
apps.get_model('users.UserData').objects.create(user=user, accepted_terms=True)
|
||||
|
||||
return user
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,23 @@
|
|||
# Generated by Django 2.1.15 on 2020-05-19 09:33
|
||||
|
||||
from django.conf import settings
|
||||
from django.db import migrations, models
|
||||
import django.db.models.deletion
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('users', '0017_auto_20200430_1251'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name='UserData',
|
||||
fields=[
|
||||
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('accepted_terms', models.BooleanField(default=False)),
|
||||
('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='user_data', to=settings.AUTH_USER_MODEL)),
|
||||
],
|
||||
),
|
||||
]
|
||||
|
|
@ -236,6 +236,11 @@ class UserSetting(models.Model):
|
|||
selected_class = models.ForeignKey(SchoolClass, blank=True, null=True, on_delete=models.CASCADE)
|
||||
|
||||
|
||||
class UserData(models.Model):
|
||||
user = models.OneToOneField(get_user_model(), on_delete=models.CASCADE, related_name='user_data')
|
||||
accepted_terms = models.BooleanField(default=False)
|
||||
|
||||
|
||||
class License(models.Model):
|
||||
for_role = models.ForeignKey(Role, blank=False, null=True, on_delete=models.CASCADE)
|
||||
licensee = models.ForeignKey(User, blank=False, null=True, on_delete=models.CASCADE)
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ from datetime import timedelta
|
|||
from unittest.mock import patch
|
||||
|
||||
import requests
|
||||
from django.conf import settings
|
||||
from django.contrib.sessions.middleware import SessionMiddleware
|
||||
from django.test import TestCase, RequestFactory
|
||||
from django.utils import timezone
|
||||
|
|
@ -24,10 +25,13 @@ from core.hep_client import HepClient
|
|||
from core.tests.mock_hep_data_factory import MockResponse, ME_DATA, VALID_STUDENT_ORDERS, VALID_TEACHERS_ORDERS, \
|
||||
NOT_CONFIRMED_ME
|
||||
from users.factories import LicenseFactory
|
||||
from users.models import Role, User, SchoolClass, License
|
||||
from users.models import Role, User, SchoolClass, License, UserData
|
||||
|
||||
TOKEN = 'abcd12345!'
|
||||
|
||||
MYSKILLBOX_GROUP_ID_ME_DATA = ME_DATA.copy()
|
||||
MYSKILLBOX_GROUP_ID_ME_DATA['group_id'] = settings.HEP_MYSKILLBOX_GROUP_ID
|
||||
|
||||
|
||||
class LoginTests(TestCase):
|
||||
def setUp(self):
|
||||
|
|
@ -159,6 +163,23 @@ class LoginTests(TestCase):
|
|||
self.assertTrue(result.get('data').get('login').get('success'))
|
||||
self.assertTrue(self.user.is_authenticated)
|
||||
|
||||
try:
|
||||
UserData.objects.get(user=user)
|
||||
self.fail('LoginTests.test_teacher_can_login_with_remote_user_and_remote_license: Userdata should not exist')
|
||||
except:
|
||||
pass
|
||||
|
||||
@patch.object(HepClient, '_customer_orders', return_value=VALID_TEACHERS_ORDERS)
|
||||
@patch.object(HepClient, 'customer_me', return_value=MYSKILLBOX_GROUP_ID_ME_DATA)
|
||||
@patch.object(HepClient, 'fetch_admin_token', return_value={'token': 'AABBCCDDEE**44566'})
|
||||
def test_teacher_can_login_with_remote_user_and_remote_license_with_myskillbox_group_id(self, order_mock, me_mock, admin_token_mock):
|
||||
self.make_login_mutation(TOKEN)
|
||||
user = User.objects.get(email=MYSKILLBOX_GROUP_ID_ME_DATA['email'])
|
||||
try:
|
||||
UserData.objects.get(user=user)
|
||||
except:
|
||||
self.fail('LoginTests.test_teacher_can_login_with_remote_user_and_remote_license: Userdata should exist')
|
||||
|
||||
@patch.object(HepClient, '_customer_orders', return_value=VALID_STUDENT_ORDERS)
|
||||
@patch.object(HepClient, 'customer_me', return_value=ME_DATA)
|
||||
@patch.object(HepClient, 'fetch_admin_token', return_value={'token': 'AABBCCDDEE**44566'})
|
||||
|
|
|
|||
Loading…
Reference in New Issue