Skip to content
Open
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
10 changes: 7 additions & 3 deletions percy/snapshot.py
Original file line number Diff line number Diff line change
Expand Up @@ -372,18 +372,22 @@ def percy_snapshot(driver, name, **kwargs):
driver.execute_script(percy_dom_script)
cookies = driver.get_cookies()

# Merge .percy.yml config options with snapshot options (snapshot options take priority)
config_options = data['config'].get('snapshot', {})
merged_kwargs = {**config_options, **kwargs}

# Serialize and capture the DOM
if is_responsive_snapshot_capture(data['config'], **kwargs):
if is_responsive_snapshot_capture(data['config'], **merged_kwargs):
dom_snapshot = capture_responsive_dom(
driver=driver,
cookies=cookies,
config=data['config'],
percy_dom_script=percy_dom_script,
**kwargs,
**merged_kwargs,
)
else:
dom_snapshot = get_serialized_dom(
driver, cookies, percy_dom_script=percy_dom_script, **kwargs)
driver, cookies, percy_dom_script=percy_dom_script, **merged_kwargs)

# Post the DOM to the snapshot endpoint with snapshot options and other info
response = requests.post(f'{PERCY_CLI_API}/percy/snapshot', json={**kwargs, **{
Expand Down
Loading