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

Use correct moments format for Showing last us time instead of value test #9923

Merged
merged 1 commit into from Nov 20, 2017

Conversation

mayt
Copy link
Contributor

@mayt mayt commented Nov 20, 2017

Fixes #9925

…test

Fixes this issue:
PhantomJS 2.1.1 (Mac OS X 0.0.0) SingleStatCtrl showing last us time
instead of value should set formatted value FAILED
	expected '09/17/2017 4:56:37 pm' to equal '09/17/2017 16:56:37 pm'
@codecov-io
Copy link

Codecov Report

Merging #9923 into master will decrease coverage by 0.24%.
The diff coverage is n/a.

@@            Coverage Diff            @@
##           master   #9923      +/-   ##
=========================================
- Coverage   44.45%   44.2%   -0.25%     
=========================================
  Files         252     250       -2     
  Lines       22089   21955     -134     
  Branches      597     572      -25     
=========================================
- Hits         9819    9705     -114     
+ Misses      11720   11705      -15     
+ Partials      550     545       -5

@torkelo torkelo merged commit c1e5f5b into grafana:master Nov 20, 2017
@torkelo torkelo added this to the 4.7.0 milestone Nov 20, 2017
@torkelo
Copy link
Member

torkelo commented Nov 20, 2017

thanks

ryantxu added a commit to NatelEnergy/grafana that referenced this pull request Nov 21, 2017
* grafana/master: (46 commits)
  mysql: add data source support for Azure MySql
  fix: alert list panel now works correctly after adding manual annotation on dashboard, fixes grafana#9951
  prom: add prom2 dashboard as bundled dashboard
  show top 5 max scrape durations by job, and fix legend format
  fix scrape duration, add rule eval iteration stats, and reorg a bit
  fix data source var and remove node_exporter dependency
  First draft of a Prometheus 2.0 Stats dashboard
  prom: initial docker block for prometheus 2
  converted test-files to jest
  converted influx-series to TS, converted test to jest
  Move the loading flag to PanelCtrl (grafana#9929)
  graph: disable zoom in non-timeseries modes (grafana#9914)
  changed padding to pixels, fixes grafana#9916 (grafana#9924)
  Use correct moments format for Showing last us time instead of value test (grafana#9923)
  Don't import JSON dashboards from hidden directories.
  influxdb: another minor refactor of grafana#9474
  refactor: refactoring InfluxDB query builder with policy PR grafana#9473
  refactor: refactoring InfluxDB query builder with policy PR grafana#9473
  docs: added versions_to_keep to config docs, grafana#9671
  Update CHANGELOG.md
  ...
@bergquist bergquist modified the milestones: 4.7.0, 5.0.0-beta1 Jan 26, 2018
@ying-jeanne ying-jeanne added the pr/external This PR is from external contributor label Apr 29, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr/external This PR is from external contributor
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] SingleStatCtrl test fails due to incorrect formatter pattern
5 participants