Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: rero/rero-ils
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9d2ce3eb274522a8fb35d5e554510d2602c4a55d
Choose a base ref
..
head repository: rero/rero-ils
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 94710745badbca8366e323c1ce6d52a05419545e
Choose a head ref
Showing with 9 additions and 126 deletions.
  1. +4 −4 scripts/bootstrap
  2. +0 −117 tests/fixtures/circulation.py
  3. +5 −5 tests/fixtures/metadata.py
8 changes: 4 additions & 4 deletions scripts/bootstrap
Original file line number Diff line number Diff line change
@@ -62,20 +62,20 @@ echo "Install with command: ${cmd} ${flags[@]}"
${cmd} ${flags[@]}

# install assets utils
npm i npm@latest -g --prefix `pipenv --venv` && pipenv run npm install --prefix `pipenv --venv` --silent -g node-sass@4.9.0 clean-css@3.4.19 uglify-js@2.7.3 requirejs@2.2.0 @angular/cli@7.0.4

virtualenv_path=`pipenv --venv`
pipenv run npm i npm@latest -g --prefix "${virtualenv_path}" && pipenv run npm install --prefix "${virtualenv_path}" --silent -g node-sass@4.9.0 clean-css@3.4.19 uglify-js@2.7.3 requirejs@2.2.0 @angular/cli@7.0.4

# collect static files and compile html/css assets
CWD=`pwd`
# build the angular ui application
cd ui; npm ci; pipenv run npm run deploy
cd ui; pipenv run npm ci; pipenv run npm run deploy

# install the npm dependencies
cd ${CWD}
pipenv run invenio npm
static_folder=$(pipenv run invenio shell --no-term-title -c "print('static_folder:%s' % app.static_folder)"|grep static_folder| cut -d: -f2-)
cd $static_folder
npm install
pipenv run npm install
cd ${CWD}

# build the web assets
117 changes: 0 additions & 117 deletions tests/fixtures/circulation.py
Original file line number Diff line number Diff line change
@@ -302,36 +302,6 @@ def patron_martigny(
return ptrn


# ------------ Org: Martigny Patron 1 ----------
@pytest.fixture(scope="module")
def patron_martigny_data(data):
"""Load Martigny patron data."""
return deepcopy(data.get('ptrn6'))


@pytest.fixture(scope="function")
def patron_martigny_data_tmp(data):
"""Load Martigny patron data scope function."""
return deepcopy(data.get('ptrn6'))


@pytest.fixture(scope="module")
def patron_martigny(
app,
roles,
lib_martigny,
patron_type_children_martigny,
patron_martigny_data):
"""Create Martigny patron record."""
ptrn = Patron.create(
data=patron_martigny_data,
delete_pid=False,
dbcommit=True,
reindex=True)
flush_index(PatronsSearch.Meta.index)
return ptrn


@pytest.fixture(scope="module")
@mock.patch('rero_ils.modules.patrons.api.send_reset_password_instructions')
def patron_martigny_no_email(
@@ -454,93 +424,6 @@ def patron_martigny_no_email(
return ptrn


# ------------ Org: Martigny Patron 2 ----------
@pytest.fixture(scope="module")
def patron2_martigny_data(data):
"""Load Martigny patron data."""
return deepcopy(data.get('ptrn7'))


@pytest.fixture(scope="module")
def patron2_martigny(
app,
roles,
lib_martigny,
patron_type_adults_martigny,
patron2_martigny_data):
"""Create Martigny patron record."""
ptrn = Patron.create(
data=patron2_martigny_data,
delete_pid=False,
dbcommit=True,
reindex=True)
flush_index(PatronsSearch.Meta.index)
return ptrn


@pytest.fixture(scope="module")
@mock.patch('rero_ils.modules.patrons.api.send_reset_password_instructions')
def patron2_martigny_no_email(
app,
roles,
patron_type_adults_martigny,
patron2_martigny_data):
"""Create Martigny patron without sending reset password instruction."""
ptrn = Patron.create(
data=patron2_martigny_data,
delete_pid=False,
dbcommit=True,
reindex=True)
flush_index(PatronsSearch.Meta.index)
return ptrn


# ------------ Org: Sion, Lib: Sion, System Librarian ----------
@pytest.fixture(scope="module")
def system_librarian_sion_data(data):
"""Load Sion system librarian data."""
return deepcopy(data.get('ptrn8'))


@pytest.fixture(scope="function")
def system_librarian_sion_data_tmp(data):
"""Load Sion system librarian data scope function."""
return deepcopy(data.get('ptrn8'))


@pytest.fixture(scope="module")
def system_librarian_sion(
app,
roles,
lib_sion,
system_librarian_sion_data):
"""Create Sion system librarian record."""
ptrn = Patron.create(
data=system_librarian_sion_data,
delete_pid=False,
dbcommit=True,
reindex=True)
flush_index(PatronsSearch.Meta.index)
return ptrn


@pytest.fixture(scope="module")
@mock.patch('rero_ils.modules.patrons.api.send_reset_password_instructions')
def system_librarian_sion_no_email(
app,
roles,
lib_sion,
system_librarian_sion_data):
"""Create Sion system librarian without sending reset password."""
ptrn = Patron.create(
data=system_librarian_sion_data,
delete_pid=False,
dbcommit=True,
reindex=True)
flush_index(PatronsSearch.Meta.index)
return ptrn


# ------------ Org: Sion, Lib: Sion, Librarian ----------
@pytest.fixture(scope="module")
def librarian_sion_data(data):
10 changes: 5 additions & 5 deletions tests/fixtures/metadata.py
Original file line number Diff line number Diff line change
@@ -339,21 +339,21 @@ def item_lib_sion(


@pytest.fixture(scope="module")
def item_lib_sion_org2_data(data):
def item2_lib_sion_data(data):
"""Load item of sion library."""
return deepcopy(data.get('item6'))


@pytest.fixture(scope="module")
def item_lib_sion_org2(
def item2_lib_sion(
app,
document,
item_lib_sion_org2_data,
item2_lib_sion_data,
loc_restricted_sion,
item_type_regular_sion):
"""Create item of sion library."""
item = Item.create(
data=item_lib_sion_org2_data,
data=item2_lib_sion_data,
delete_pid=False,
dbcommit=True,
reindex=True)
@@ -436,7 +436,7 @@ def holding_lib_sion_data(data):
@pytest.fixture(scope="module")
def holding_lib_sion(app, document, holding_lib_sion_data,
loc_public_sion, item_type_internal_sion):
"""Create holding of saxon library."""
"""Create holding of sion library."""
holding = Holding.create(
data=holding_lib_sion_data,
delete_pid=False,