Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Issue #2943] markup split typo bugfix #2942

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions api/tests/src/db/models/factories.py
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ class CustomProvider(BaseProvider):
"{{agency_code}} is looking to further investigate this topic. {{paragraph}}",
"<p>{{paragraph}}</p><p><br></p><p>{{paragraph}}</p>",
"The purpose of this Notice of Funding Opportunity (NOFO) is to support research into {{job}} and how we might {{catch_phrase}}.",
"<div>{{paragraph:long}} <a href='{{relevant_url}}'>{{sentence}}</a> {{paragraph:long}}</div> <div>{{paragraph:long}} <a href='{{relevant_url}}'>{{sentence}}</a> {{paragraph:long}}</div>"
]

# In the formatting, ? becomes a random letter, # becomes a random digit
Expand All @@ -157,6 +158,7 @@ class CustomProvider(BaseProvider):
"s3://local-opportunities/test_file_5.pdf",
]


def agency_code(self) -> str:
return self.random_element(self.AGENCIES)

Expand Down Expand Up @@ -189,6 +191,7 @@ def opportunity_title(self) -> str:
return self.generator.parse(pattern)

def summary_description(self) -> str:
self.generator.set_arguments("long", { "nb_sentences": 25 })
pattern = self.random_element(self.SUMMARY_DESCRIPTION_FORMATS)
return self.generator.parse(pattern)

Expand Down Expand Up @@ -582,7 +585,6 @@ class Params:
close_date_description=factory.Faker("paragraph", nb_sentences=30),
)


class CurrentOpportunitySummaryFactory(BaseFactory):
class Meta:
model = opportunity_models.CurrentOpportunitySummary
Expand Down Expand Up @@ -623,7 +625,6 @@ class Params:
opportunity_summary__has_long_descriptions=True,
)


class OpportunityAssistanceListingFactory(BaseFactory):
class Meta:
model = opportunity_models.OpportunityAssistanceListing
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/utils/generalUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ export const splitMarkup = (
}
// handle things like urls within tag params that need to be ignored
if (
(tracker.openTagIndicator && character === `"`) ||
character === `'`
tracker.openTagIndicator &&
(character === `"` || character === `'`)
) {
tracker.inQuotes = !tracker.inQuotes;
}
Expand Down
Loading