Skip to content

Commit

Permalink
Fix spacing in some Dataporten tests
Browse files Browse the repository at this point in the history
  • Loading branch information
afriestad authored and JakobGM committed Sep 27, 2017
1 parent 03f8f40 commit 156baf3
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 20 deletions.
45 changes: 26 additions & 19 deletions dataporten/tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ def study_program_json():
"type": "fc:fs:prg",
}


@pytest.fixture
def course_json():
return {
Expand All @@ -71,6 +72,7 @@ def course_json():
"url": "http://www.ntnu.no/exphil"
}


@pytest.fixture
def main_profile_json():
return {
Expand All @@ -88,6 +90,7 @@ def main_profile_json():
"id": "fc:fs:fs:str:ntnu.no:MTFYMA-IM"
}


@pytest.fixture
def organisation_unit_json():
return {
Expand All @@ -102,6 +105,7 @@ def organisation_unit_json():
}
}


@pytest.fixture
def finished_course():
return Course(
Expand All @@ -124,6 +128,7 @@ def finished_course():
}
)


@pytest.fixture
def non_finished_course():
return Course(
Expand All @@ -144,6 +149,7 @@ def non_finished_course():
}
)


@pytest.fixture
def ongoing_course():
return Course(
Expand All @@ -166,24 +172,25 @@ def ongoing_course():
}
)


@pytest.fixture
def course_last_semester():
return Course(
{
"displayName": "Line\u00e6re metoder",
"id": "fc:fs:fs:emne:ntnu.no:TMA4145:1",
"parent": "fc:org:ntnu.no",
"type": "fc:fs:emne",
"membership": {
"displayName": "Student",
"notAfter": "2016-12-14T23:00:00Z",
"active": True,
"fsroles": [
"STUDENT"
],
"subjectRelations": "undervisning",
"basic": "member"
},
"url": "http://wiki.math.ntnu.no/tma4145"
}
)
return Course(
{
"displayName": "Line\u00e6re metoder",
"id": "fc:fs:fs:emne:ntnu.no:TMA4145:1",
"parent": "fc:org:ntnu.no",
"type": "fc:fs:emne",
"membership": {
"displayName": "Student",
"notAfter": "2016-12-14T23:00:00Z",
"active": True,
"fsroles": [
"STUDENT"
],
"subjectRelations": "undervisning",
"basic": "member"
},
"url": "http://wiki.math.ntnu.no/tma4145"
}
)
1 change: 0 additions & 1 deletion dataporten/tests/test_models.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
CourseManager,
DataportenUser,
)
from ..parsers import StudyProgram


@freeze_time('2016-01-01')
Expand Down

0 comments on commit 156baf3

Please sign in to comment.