-
+
+
Order #{{ request_id }}
+
Financial Verification
+
-
-
Order #{{ request_id }}
- Financial Verification
-
+
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/templates/requests/menu.html b/templates/requests/menu.html
index d62de246..40de55d3 100644
--- a/templates/requests/menu.html
+++ b/templates/requests/menu.html
@@ -1,7 +1,7 @@
+
+
+
Tooltips
+ {{ Tooltip('this is a tooltip text') }}default
+ {{ Icon('help') }}top-start
+ {{ Icon('help') }}right
+ {{ Icon('help') }}bottom
+
+
+
+
+
+
Labels
+ Label
+ Label Info
+ Label Warning
+ Label Error
+ Label Success
+
+
+
Another panel without padding
diff --git a/tests/conftest.py b/tests/conftest.py
index 12e7c320..e5094c1b 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -69,6 +69,7 @@ def session(db, request):
]
for factory in factory_list:
factory._meta.sqlalchemy_session = session
+ factory._meta.sqlalchemy_session_persistence = "commit"
yield session
diff --git a/tests/domain/authnid/test_crl.py b/tests/domain/authnid/test_crl.py
index 5593a865..1b9fa2ec 100644
--- a/tests/domain/authnid/test_crl.py
+++ b/tests/domain/authnid/test_crl.py
@@ -66,8 +66,9 @@ def test_parse_disa_pki_list():
assert len(crl_list) == len(href_matches)
class MockStreamingResponse():
- def __init__(self, content_chunks):
+ def __init__(self, content_chunks, code=200):
self.content_chunks = content_chunks
+ self.status_code = code
def iter_content(self, chunk_size=0):
return self.content_chunks
@@ -81,6 +82,10 @@ class MockStreamingResponse():
def test_write_crl(tmpdir, monkeypatch):
monkeypatch.setattr('requests.get', lambda u, **kwargs: MockStreamingResponse([b'it worked']))
crl = 'crl_1'
- util.write_crl(tmpdir, crl)
+ assert util.write_crl(tmpdir, "random_target_dir", crl)
assert [p.basename for p in tmpdir.listdir()] == [crl]
assert [p.read() for p in tmpdir.listdir()] == ['it worked']
+
+def test_skips_crl_if_it_has_not_been_modified(tmpdir, monkeypatch):
+ monkeypatch.setattr('requests.get', lambda u, **kwargs: MockStreamingResponse([b'it worked'], 304))
+ assert not util.write_crl(tmpdir, "random_target_dir", 'crl_file_name')
diff --git a/tests/domain/test_date.py b/tests/domain/test_date.py
new file mode 100644
index 00000000..fe80530d
--- /dev/null
+++ b/tests/domain/test_date.py
@@ -0,0 +1,21 @@
+import pytest
+import pendulum
+
+from atst.domain.date import parse_date
+
+
+def test_date_with_slashes():
+ date_str = "1/2/2020"
+ assert parse_date(date_str) == pendulum.date(2020, 1, 2)
+
+
+def test_date_with_dashes():
+ date_str = "2020-1-2"
+ assert parse_date(date_str) == pendulum.date(2020, 1, 2)
+
+
+def test_invalid_date():
+ date_str = "This is not a valid data"
+ with pytest.raises(ValueError):
+ parse_date(date_str)
+
diff --git a/tests/domain/test_requests.py b/tests/domain/test_requests.py
index 2044d52b..332e3c6c 100644
--- a/tests/domain/test_requests.py
+++ b/tests/domain/test_requests.py
@@ -3,9 +3,10 @@ from uuid import uuid4
from atst.domain.exceptions import NotFoundError
from atst.domain.requests import Requests
+from atst.models.request import Request
from atst.models.request_status_event import RequestStatus
-from tests.factories import RequestFactory, UserFactory
+from tests.factories import RequestFactory, UserFactory, RequestStatusEventFactory
@pytest.fixture(scope="function")
@@ -63,3 +64,27 @@ def test_exists(session):
request = RequestFactory.create(creator=user_allowed)
assert Requests.exists(request.id, user_allowed)
assert not Requests.exists(request.id, user_denied)
+
+
+def test_status_count(session):
+ # make sure table is empty
+ session.query(Request).delete()
+
+ request1 = RequestFactory.create()
+ request2 = RequestFactory.create()
+ RequestStatusEventFactory.create(sequence=2, request_id=request2.id, new_status=RequestStatus.PENDING_FINANCIAL_VERIFICATION)
+
+ assert Requests.status_count(RequestStatus.PENDING_FINANCIAL_VERIFICATION) == 1
+ assert Requests.status_count(RequestStatus.STARTED) == 1
+ assert Requests.in_progress_count() == 2
+
+def test_status_count_scoped_to_creator(session):
+ # make sure table is empty
+ session.query(Request).delete()
+
+ user = UserFactory.create()
+ request1 = RequestFactory.create()
+ request2 = RequestFactory.create(creator=user)
+
+ assert Requests.status_count(RequestStatus.STARTED) == 2
+ assert Requests.status_count(RequestStatus.STARTED, creator=user) == 1
diff --git a/tests/factories.py b/tests/factories.py
index cf81fa71..07073424 100644
--- a/tests/factories.py
+++ b/tests/factories.py
@@ -39,6 +39,7 @@ class RequestStatusEventFactory(factory.alchemy.SQLAlchemyModelFactory):
model = RequestStatusEvent
id = factory.Sequence(lambda x: uuid4())
+ sequence = 1
class RequestFactory(factory.alchemy.SQLAlchemyModelFactory):
@@ -56,6 +57,7 @@ class RequestFactory(factory.alchemy.SQLAlchemyModelFactory):
def build_request_body(cls, user, dollar_value=1000000):
return {
"primary_poc": {
+ "am_poc": False,
"dodid_poc": user.dod_id,
"email_poc": user.email,
"fname_poc": user.first_name,
@@ -66,7 +68,7 @@ class RequestFactory(factory.alchemy.SQLAlchemyModelFactory):
"start_date": "2018-08-08",
"cloud_native": "yes",
"dollar_value": dollar_value,
- "dod_component": "us_navy",
+ "dod_component": "Army and Air Force Exchange Service",
"data_transfers": "less_than_100gb",
"jedi_migration": "yes",
"num_software_systems": 1,
@@ -75,6 +77,7 @@ class RequestFactory(factory.alchemy.SQLAlchemyModelFactory):
"engineering_assessment": "yes",
"technical_support_team": "yes",
"estimated_monthly_spend": 100,
+ "average_daily_traffic_gb": 4,
"expected_completion_date": "less_than_1_month",
"rationalization_software_systems": "yes",
"organization_providing_assistance": "in_house_staff"
@@ -86,7 +89,7 @@ class RequestFactory(factory.alchemy.SQLAlchemyModelFactory):
"email_request": user.email,
"fname_request": user.first_name,
"lname_request": user.last_name,
- "service_branch": "ads",
+ "service_branch": "Air Force, Department of the",
"date_latest_training": "2018-08-06"
}
}
diff --git a/tests/forms/test_request.py b/tests/forms/test_request.py
new file mode 100644
index 00000000..9d5e4201
--- /dev/null
+++ b/tests/forms/test_request.py
@@ -0,0 +1,85 @@
+import pytest
+
+from atst.forms.request import RequestForm
+
+
+class TestRequestForm:
+
+ form_data = {
+ 'dod_component': 'Army and Air Force Exchange Service',
+ 'jedi_usage': 'cloud-ify all the things',
+ 'num_software_systems': '12',
+ 'estimated_monthly_spend': '1000000',
+ 'dollar_value': '42',
+ 'number_user_sessions': '6',
+ 'average_daily_traffic': '0',
+ 'start_date': '12/12/2012',
+ }
+ migration_data = {
+ 'jedi_migration': 'yes',
+ 'rationalization_software_systems': 'yes',
+ 'technical_support_team': 'yes',
+ 'organization_providing_assistance': 'in_house_staff',
+ 'engineering_assessment': 'yes',
+ 'data_transfers': 'less_than_100gb',
+ 'expected_completion_date': 'less_than_1_month'
+ }
+
+ def test_require_cloud_native_when_not_migrating(self):
+ extra_data = { 'jedi_migration': 'no' }
+ request_form = RequestForm(data={ **self.form_data, **extra_data })
+ assert not request_form.validate()
+ assert request_form.errors == { 'cloud_native': ['Not a valid choice'] }
+
+ def test_require_migration_questions_when_migrating(self):
+ extra_data = { 'jedi_migration': 'yes' }
+ request_form = RequestForm(data={ **self.form_data, **extra_data })
+ assert not request_form.validate()
+ assert request_form.errors == {
+ 'rationalization_software_systems': ['Not a valid choice'],
+ 'technical_support_team': ['Not a valid choice'],
+ 'organization_providing_assistance': ['Not a valid choice'],
+ 'engineering_assessment': ['Not a valid choice'],
+ 'data_transfers': ['Not a valid choice'],
+ 'expected_completion_date': ['Not a valid choice']
+ }
+
+ def test_require_organization_when_technical_support_team(self):
+ data = { **self.form_data, **self.migration_data }
+ del data['organization_providing_assistance']
+
+ request_form = RequestForm(data=data)
+ assert not request_form.validate()
+ assert request_form.errors == {
+ 'organization_providing_assistance': ['Not a valid choice'],
+ }
+
+ def test_valid_form_data(self):
+ data = { **self.form_data, **self.migration_data }
+ data['technical_support_team'] = 'no'
+ del data['organization_providing_assistance']
+
+ request_form = RequestForm(data=data)
+ assert request_form.validate()
+
+ def test_sessions_required_for_large_projects(self):
+ data = { **self.form_data, **self.migration_data }
+ data['estimated_monthly_spend'] = '9999999'
+ del data['number_user_sessions']
+ del data['average_daily_traffic']
+
+ request_form = RequestForm(data=data)
+ assert not request_form.validate()
+ assert request_form.errors == {
+ 'number_user_sessions': ['This field is required.'],
+ 'average_daily_traffic': ['This field is required.'],
+ }
+
+ def test_sessions_not_required_invalid_monthly_spend(self):
+ data = { **self.form_data, **self.migration_data }
+ data['estimated_monthly_spend'] = 'foo'
+ del data['number_user_sessions']
+ del data['average_daily_traffic']
+
+ request_form = RequestForm(data=data)
+ assert request_form.validate()
diff --git a/tests/models/test_requests.py b/tests/models/test_requests.py
index d6592a25..987723af 100644
--- a/tests/models/test_requests.py
+++ b/tests/models/test_requests.py
@@ -65,6 +65,6 @@ def test_request_status_pending_expired_displayname():
def test_request_status_pending_deleted_displayname():
request = RequestFactory.create()
- request = Requests.set_status(request, RequestStatus.DELETED)
+ request = Requests.set_status(request, RequestStatus.CANCELED)
- assert request.status_displayname == "Deleted"
+ assert request.status_displayname == "Canceled"
diff --git a/tests/routes/test_financial_verification.py b/tests/routes/test_financial_verification.py
index 8e62cc48..fca2aa3b 100644
--- a/tests/routes/test_financial_verification.py
+++ b/tests/routes/test_financial_verification.py
@@ -47,7 +47,7 @@ class TestPENumberInForm:
response = self.submit_data(client, self.required_data)
- assert "We couldn\'t find that PE number" in response.data.decode()
+ assert "We couldn't find that PE number" in response.data.decode()
assert response.status_code == 200
def test_submit_request_form_with_unchanged_pe_id(self, monkeypatch, client):
@@ -81,5 +81,5 @@ class TestPENumberInForm:
response = self.submit_data(client, data)
- assert "There were some errors, see below" in response.data.decode()
+ assert "There were some errors" in response.data.decode()
assert response.status_code == 200
diff --git a/tests/routes/test_request_new.py b/tests/routes/test_request_new.py
index 7d770a28..dd4f926c 100644
--- a/tests/routes/test_request_new.py
+++ b/tests/routes/test_request_new.py
@@ -1,9 +1,8 @@
import re
-import pytest
-import urllib
-from tests.mocks import MOCK_USER, MOCK_REQUEST
from tests.factories import RequestFactory, UserFactory
from atst.domain.roles import Roles
+from atst.domain.requests import Requests
+from urllib.parse import urlencode
ERROR_CLASS = "alert--error"
@@ -75,9 +74,9 @@ def test_creator_info_is_autopopulated(monkeypatch, client, user_session):
response = client.get("/requests/new/2/{}".format(request.id))
body = response.data.decode()
- assert 'value="{}"'.format(user.first_name) in body
- assert 'value="{}"'.format(user.last_name) in body
- assert 'value="{}"'.format(user.email) in body
+ assert "initial-value='{}'".format(user.first_name) in body
+ assert "initial-value='{}'".format(user.last_name) in body
+ assert "initial-value='{}'".format(user.email) in body
def test_creator_info_is_autopopulated_for_new_request(monkeypatch, client, user_session):
@@ -86,9 +85,9 @@ def test_creator_info_is_autopopulated_for_new_request(monkeypatch, client, user
response = client.get("/requests/new/2")
body = response.data.decode()
- assert 'value="{}"'.format(user.first_name) in body
- assert 'value="{}"'.format(user.last_name) in body
- assert 'value="{}"'.format(user.email) in body
+ assert "initial-value='{}'".format(user.first_name) in body
+ assert "initial-value='{}'".format(user.last_name) in body
+ assert "initial-value='{}'".format(user.email) in body
def test_non_creator_info_is_not_autopopulated(monkeypatch, client, user_session):
@@ -102,3 +101,72 @@ def test_non_creator_info_is_not_autopopulated(monkeypatch, client, user_session
assert not user.first_name in body
assert not user.last_name in body
assert not user.email in body
+
+def test_am_poc_causes_poc_to_be_autopopulated(client, user_session):
+ creator = UserFactory.create()
+ user_session(creator)
+ request = RequestFactory.create(creator=creator, body={})
+ client.post(
+ "/requests/new/3/{}".format(request.id),
+ headers={"Content-Type": "application/x-www-form-urlencoded"},
+ data="am_poc=yes",
+ )
+ request = Requests.get(request.id)
+ assert request.body["primary_poc"]["dodid_poc"] == creator.dod_id
+
+
+def test_not_am_poc_requires_poc_info_to_be_completed(client, user_session):
+ creator = UserFactory.create()
+ user_session(creator)
+ request = RequestFactory.create(creator=creator, body={})
+ response = client.post(
+ "/requests/new/3/{}".format(request.id),
+ headers={"Content-Type": "application/x-www-form-urlencoded"},
+ data="am_poc=no",
+ follow_redirects=True
+ )
+ assert ERROR_CLASS in response.data.decode()
+
+
+def test_not_am_poc_allows_user_to_fill_in_poc_info(client, user_session):
+ creator = UserFactory.create()
+ user_session(creator)
+ request = RequestFactory.create(creator=creator, body={})
+ poc_input = {
+ "am_poc": "no",
+ "fname_poc": "test",
+ "lname_poc": "user",
+ "email_poc": "test.user@mail.com",
+ "dodid_poc": "1234567890",
+ }
+ response = client.post(
+ "/requests/new/3/{}".format(request.id),
+ headers={"Content-Type": "application/x-www-form-urlencoded"},
+ data=urlencode(poc_input),
+ )
+ assert ERROR_CLASS not in response.data.decode()
+
+
+def test_poc_details_can_be_autopopulated_on_new_request(client, user_session):
+ creator = UserFactory.create()
+ user_session(creator)
+ response = client.post(
+ "/requests/new/3",
+ headers={"Content-Type": "application/x-www-form-urlencoded"},
+ data="am_poc=yes",
+ )
+ request_id = response.headers["Location"].split('/')[-1]
+ request = Requests.get(request_id)
+
+ assert request.body["primary_poc"]["dodid_poc"] == creator.dod_id
+
+
+def test_can_review_data(user_session, client):
+ creator = UserFactory.create()
+ user_session(creator)
+ request = RequestFactory.create(creator=creator)
+ response = client.get("/requests/new/4/{}".format(request.id))
+ body = response.data.decode()
+ # assert a sampling of the request data is on the review page
+ assert request.body["primary_poc"]["fname_poc"] in body
+ assert request.body["information_about_you"]["email_request"] in body
diff --git a/tests/routes/test_request_submit.py b/tests/routes/test_request_submit.py
index f8e61400..480d6dc2 100644
--- a/tests/routes/test_request_submit.py
+++ b/tests/routes/test_request_submit.py
@@ -21,7 +21,7 @@ def test_submit_reviewed_request(monkeypatch, client, user_session):
follow_redirects=False,
)
assert "/requests" in response.headers["Location"]
- assert "modal" not in response.headers["Location"]
+ assert "modal=pendingCCPOApproval" in response.headers["Location"]
def test_submit_autoapproved_reviewed_request(monkeypatch, client, user_session):
@@ -35,4 +35,4 @@ def test_submit_autoapproved_reviewed_request(monkeypatch, client, user_session)
data="",
follow_redirects=False,
)
- assert "/requests?modal=" in response.headers["Location"]
+ assert "/requests?modal=pendingFinancialVerification" in response.headers["Location"]
diff --git a/tests/test_integration.py b/tests/test_integration.py
index e8fa6348..633f14b1 100644
--- a/tests/test_integration.py
+++ b/tests/test_integration.py
@@ -1,46 +1,67 @@
import pytest
-from tests.mocks import MOCK_USER
+from urllib.parse import urlencode
+from .factories import UserFactory, RequestFactory
+
from atst.routes.requests.jedi_request_flow import JEDIRequestFlow
+from atst.models.request_status_event import RequestStatus
+from atst.domain.requests import Requests
+
@pytest.fixture
def screens(app):
return JEDIRequestFlow(3).screens
-@pytest.mark.skip()
-def test_stepthrough_request_form(monkeypatch, screens, client):
- monkeypatch.setattr(
- "atst.handlers.request_new.RequestNew.get_current_user", lambda s: MOCK_USER
- )
- monkeypatch.setattr(
- "atst.handlers.request_new.RequestNew.check_xsrf_cookie", lambda s: True
- )
- monkeypatch.setattr(
- "atst.handlers.request_new.JEDIRequestFlow.validate", lambda s: True
- )
+def test_stepthrough_request_form(user_session, screens, client):
+ user = UserFactory.create()
+ user_session(user)
+ mock_request = RequestFactory.stub()
- def take_a_step(inc, req=None):
+ def post_form(url, redirects=False, data=""):
+ return client.post(
+ url,
+ headers={"Content-Type": "application/x-www-form-urlencoded"},
+ data=data,
+ follow_redirects=redirects,
+ )
+
+ def take_a_step(inc, req=None, data=None):
req_url = "/requests/new/{}".format(inc)
if req:
req_url += "/" + req
- response = client.post(
- req_url,
- headers={"Content-Type": "application/x-www-form-urlencoded"},
- data="meaning=42",
- )
- return response
+ # we do it twice, with and without redirect, in order to get the
+ # destination url
+ prelim_resp = post_form(req_url, data=data)
+ response = post_form(req_url, True, data=data)
+ return (prelim_resp.headers.get("Location"), response)
# GET the initial form
- response = client.get("/requests/new")
+ response = client.get("/requests/new/1")
assert screens[0]["title"] in response.data.decode()
# POST to each of the form pages up until review and submit
req_id = None
for i in range(1, len(screens)):
- resp = take_a_step(i, req=req_id)
- __import__('ipdb').set_trace()
- req_id = resp.effective_url.split("/")[-1]
+ # get appropriate form data to POST for this section
+ section = screens[i - 1]["section"]
+ post_data = urlencode(mock_request.body[section])
+
+ effective_url, resp = take_a_step(i, req=req_id, data=post_data)
+ req_id = effective_url.split("/")[-1]
screen_title = screens[i]["title"].replace("&", "&")
- assert "/requests/new/{}/{}".format(i + 1, req_id) in resp.effective_url
+ assert "/requests/new/{}/{}".format(i + 1, req_id) in effective_url
assert screen_title in resp.data.decode()
+
+ # at this point, the real request we made and the mock_request bodies
+ # should be equivalent
+ assert Requests.get(req_id).body == mock_request.body
+
+ # finish the review and submit step
+ client.post(
+ "/requests/submit/{}".format(req_id),
+ headers={"Content-Type": "application/x-www-form-urlencoded"},
+ )
+
+ finished_request = Requests.get(req_id)
+ assert finished_request.status == RequestStatus.PENDING_CCPO_APPROVAL
diff --git a/yarn.lock b/yarn.lock
index ab510b61..d0665a54 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -127,14 +127,10 @@ anymatch@^2.0.0:
micromatch "^3.1.4"
normalize-path "^2.1.1"
-aproba@^1.0.3, aproba@^1.1.1, aproba@^1.1.2, aproba@~1.2.0:
+aproba@^1.0.3, aproba@^1.1.1, aproba@^1.1.2, "aproba@^1.1.2 || 2", aproba@~1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
-"aproba@^1.1.2 || 2":
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
-
archy@~1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
@@ -1355,14 +1351,10 @@ color-convert@^1.3.0, color-convert@^1.9.0, color-convert@^1.9.1:
dependencies:
color-name "1.1.1"
-color-name@1.1.1:
+color-name@1.1.1, color-name@^1.0.0:
version "1.1.1"
resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.1.tgz#4b1415304cf50028ea81643643bd82ea05803689"
-color-name@^1.0.0:
- version "1.1.3"
- resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-
color-string@^0.3.0:
version "0.3.0"
resolved "https://registry.yarnpkg.com/color-string/-/color-string-0.3.0.tgz#27d46fb67025c5c2fa25993bfbf579e47841b991"
@@ -2148,18 +2140,7 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
version "1.0.5"
resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-escodegen@^1.8.1:
- version "1.11.0"
- resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.11.0.tgz#b27a9389481d5bfd5bec76f7bb1eb3f8f4556589"
- dependencies:
- esprima "^3.1.3"
- estraverse "^4.2.0"
- esutils "^2.0.2"
- optionator "^0.8.1"
- optionalDependencies:
- source-map "~0.6.1"
-
-escodegen@~1.9.0:
+escodegen@^1.8.1, escodegen@~1.9.0:
version "1.9.1"
resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.9.1.tgz#dbae17ef96c8e4bedb1356f4504fa4cc2f7cb7e2"
dependencies:
@@ -2259,14 +2240,10 @@ extglob@^2.0.4:
snapdragon "^0.8.1"
to-regex "^3.0.1"
-extsprintf@1.3.0:
+extsprintf@1.3.0, extsprintf@^1.2.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
-extsprintf@^1.2.0:
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
-
falafel@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/falafel/-/falafel-2.1.0.tgz#96bb17761daba94f46d001738b3cedf3a67fe06c"
@@ -3214,11 +3191,7 @@ js-beautify@^1.7.5:
mkdirp "~0.5.0"
nopt "~3.0.1"
-"js-tokens@^3.0.0 || ^4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
-
-js-tokens@^3.0.2:
+"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
@@ -3482,6 +3455,10 @@ lodash.memoize@~3.0.3:
version "3.0.4"
resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-3.0.4.tgz#2dcbd2c287cbc0a55cc42328bd0c736150d53e3f"
+lodash.merge@^4.6.0:
+ version "4.6.1"
+ resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.1.tgz#adc25d9cb99b9391c59624f379fbba60d7111d54"
+
lodash.mergewith@^4.6.0:
version "4.6.1"
resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927"
@@ -3802,14 +3779,10 @@ move-concurrently@^1.0.1:
rimraf "^2.5.4"
run-queue "^1.0.3"
-ms@2.0.0:
+ms@2.0.0, ms@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-ms@^2.0.0:
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
-
mute-stream@~0.0.4:
version "0.0.7"
resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
@@ -4556,14 +4529,10 @@ pascalcase@^0.1.1:
version "0.1.1"
resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
-path-browserify@0.0.0:
+path-browserify@0.0.0, path-browserify@~0.0.0:
version "0.0.0"
resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a"
-path-browserify@~0.0.0:
- version "0.0.1"
- resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz#e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a"
-
path-dirname@^1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
@@ -4652,6 +4621,10 @@ pinkie@^2.0.0:
version "2.0.4"
resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
+popper.js@^1.12.9:
+ version "1.14.4"
+ resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.14.4.tgz#8eec1d8ff02a5a3a152dd43414a15c7b79fd69b6"
+
posix-character-classes@^0.1.0:
version "0.1.1"
resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
@@ -6084,11 +6057,7 @@ static-module@^2.2.0:
static-eval "^2.0.0"
through2 "~2.0.3"
-"statuses@>= 1.4.0 < 2":
- version "1.5.0"
- resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
-
-statuses@~1.4.0:
+"statuses@>= 1.4.0 < 2", statuses@~1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
@@ -6430,14 +6399,10 @@ trim-right@^1.0.1:
dependencies:
glob "^6.0.4"
-tty-browserify@0.0.0:
+tty-browserify@0.0.0, tty-browserify@~0.0.0:
version "0.0.0"
resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
-tty-browserify@~0.0.0:
- version "0.0.1"
- resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.1.tgz#3f05251ee17904dfd0677546670db9651682b811"
-
tunnel-agent@^0.6.0:
version "0.6.0"
resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
@@ -6640,6 +6605,14 @@ uuid@^3.0.0, uuid@^3.1.0, uuid@^3.3.2:
version "3.3.2"
resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
+v-tooltip@^2.0.0-rc.33:
+ version "2.0.0-rc.33"
+ resolved "https://registry.yarnpkg.com/v-tooltip/-/v-tooltip-2.0.0-rc.33.tgz#78f7d8e9c34265622be65ba9dc78c67f1dc02b73"
+ dependencies:
+ lodash.merge "^4.6.0"
+ popper.js "^1.12.9"
+ vue-resize "^0.4.3"
+
v8-compile-cache@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.0.tgz#526492e35fc616864284700b7043e01baee09f0a"
@@ -6679,6 +6652,10 @@ vm-browserify@0.0.4, vm-browserify@~0.0.1:
dependencies:
indexof "0.0.1"
+vue-resize@^0.4.3:
+ version "0.4.4"
+ resolved "https://registry.yarnpkg.com/vue-resize/-/vue-resize-0.4.4.tgz#dee9b8dd1b189e7e3f6ec47f86c60694a241bb17"
+
vue-text-mask@^6.1.2:
version "6.1.2"
resolved "https://registry.yarnpkg.com/vue-text-mask/-/vue-text-mask-6.1.2.tgz#2cc18a1ca04ea66798518a9373929a12256d14b9"