Merge pull request facebook#6763 from nfcampos/is-running

added isProfiling() to ReactDebugTool and isRunning() to PerfTools
zpao · May 13, 2016 · 5569d1d · 5569d1d
2 parents 20bcabb + 5b93a2b
commit 5569d1d
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 0 deletions.
diff --git a/src/isomorphic/ReactDebugTool.js b/src/isomorphic/ReactDebugTool.js
@@ -115,6 +115,9 @@ var ReactDebugTool = {
       }
     }
   },
+  isProfiling() {
+    return isProfiling;
+  },
   beginProfiling() {
     if (__DEV__) {
       if (isProfiling) {

diff --git a/src/isomorphic/ReactPerf.js b/src/isomorphic/ReactPerf.js
@@ -351,6 +351,10 @@ function stop() {
   ReactDebugTool.endProfiling();
 }
 
+function isRunning() {
+  return ReactDebugTool.isProfiling();
+}
+
 var ReactPerfAnalysis = {
   getLastMeasurements: getFlushHistory,
   getExclusive,
@@ -363,6 +367,7 @@ var ReactPerfAnalysis = {
   printOperations,
   start,
   stop,
+  isRunning,
   // Deprecated:
   printDOM,
   getMeasurementsSummaryMap,

diff --git a/src/isomorphic/__tests__/ReactDebugTool-test.js b/src/isomorphic/__tests__/ReactDebugTool-test.js
@@ -72,4 +72,14 @@ describe('ReactDebugTool', function() {
     ReactDebugTool.onTestEvent();
     expect(console.error.calls.length).toBe(1);
   });
+
+  it('returns isProfiling state', () => {
+    expect(ReactDebugTool.isProfiling()).toBe(false);
+
+    ReactDebugTool.beginProfiling();
+    expect(ReactDebugTool.isProfiling()).toBe(true);
+
+    ReactDebugTool.endProfiling();
+    expect(ReactDebugTool.isProfiling()).toBe(false);
+  });
 });
diff --git a/src/isomorphic/__tests__/ReactPerf-test.js b/src/isomorphic/__tests__/ReactPerf-test.js
@@ -283,4 +283,37 @@ describe('ReactPerf', function() {
     ReactPerf.printDOM(measurements);
     expect(console.error.calls.length).toBe(1);
   });
+
+  it('returns isRunning state', () => {
+    expect(ReactPerf.isRunning()).toBe(false);
+
+    ReactPerf.start();
+    expect(ReactPerf.isRunning()).toBe(true);
+
+    ReactPerf.stop();
+    expect(ReactPerf.isRunning()).toBe(false);
+  });
+
+  it('start has no effect when already running', () => {
+    expect(ReactPerf.isRunning()).toBe(false);
+
+    ReactPerf.start();
+    expect(ReactPerf.isRunning()).toBe(true);
+
+    ReactPerf.start();
+    expect(ReactPerf.isRunning()).toBe(true);
+
+    ReactPerf.stop();
+    expect(ReactPerf.isRunning()).toBe(false);
+  });
+
+  it('stop has no effect when already stopped', () => {
+    expect(ReactPerf.isRunning()).toBe(false);
+
+    ReactPerf.stop();
+    expect(ReactPerf.isRunning()).toBe(false);
+
+    ReactPerf.stop();
+    expect(ReactPerf.isRunning()).toBe(false);
+  });
 });