Skip to content

Commit 913d60f

Browse files
jamesdbloomjamesdbloom
committed
fixed name of node module
1 parent 009d3c0 commit 913d60f

File tree

8 files changed

+31
-29
lines changed

8 files changed

+31
-29
lines changed

‎jekyll-www.mock-server.com/_includes/head.html

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,13 @@
4141
<meta http-equiv="refresh" content="0;URL='http://www.mock-server.com/'" />
4242
{% endif %}
4343

44-
<!-- Google Tag Manager -->
45-
<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src='https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);})(window,document,'script','dataLayer','GTM-TCG9F4');</script>
46-
<!-- End Google Tag Manager -->
44+
<!-- Global site tag (gtag.js) - Google Analytics -->
45+
<script async src="https://www.googletagmanager.com/gtag/js?id=UA-32687194-4"></script>
46+
<script>
47+
window.dataLayer = window.dataLayer || [];
48+
function gtag(){dataLayer.push(arguments);}
49+
gtag('js', new Date());
50+
51+
gtag('config', 'UA-32687194-4');
52+
</script>
4753
</head>

‎jekyll-www.mock-server.com/_layouts/default.html

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@
55

66
<body>
77

8-
<!-- Google Tag Manager (noscript) -->
9-
<noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-TCG9F4" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
10-
<!-- End Google Tag Manager (noscript) -->
11-
128
<div id="layout">
139

1410
{% include header.html %}

‎jekyll-www.mock-server.com/mock_server/_includes/running_mock_server_detail.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ <h3>Running From Command Line - Using Java</h3>
436436

437437
<pre><code class="code">java -Dmockserver.logLevel=INFO -jar ~/Downloads/mockserver-netty-4.0.0-jar-with-dependencies.jar -serverPort <span class="numeric_literal">1080</span> -proxyPort <span class="numeric_literal">1090</span></code></pre>
438438

439-
<p>All interactions with the MockServer are logged including setting up expectations, matching expectations, clearing expectations and verifying requests. The when running from the command line, Maven plugin, Grunt plugin or npm module the log is written to a file called <strong>mockserver.log</strong> in the current working directory where the MockServer is running. This log can be particularly helpful when trying to debug why a test is failing or expectations are not being matched.</p>
439+
<p>All interactions with the MockServer are logged including setting up expectations, matching expectations, clearing expectations and verifying requests. The when running from the command line, Maven plugin, npm module or Grunt plugin the log is written to a file called <strong>mockserver.log</strong> in the current working directory where the MockServer is running. This log can be particularly helpful when trying to debug why a test is failing or expectations are not being matched.</p>
440440

441441
<p>The system property <span class="inline_code">mockserver.logLevel</span> can be used to set the <a href="/mock_server/debugging_issues.html#logging-levels">log level</a>, as shown above.</p>
442442

@@ -508,7 +508,7 @@ <h2>Web Archive (WAR)</h2>
508508

509509
<a name="mockserver_grunt" class="anchor" href="#mockserver_grunt">&nbsp;</a>
510510

511-
<h2>MockServer Grunt Plugin & NPM Module</h2>
511+
<h2>NPM Module & MockServer Grunt Plugin</h2>
512512

513513
{% include_subpage ../mock_server/_includes/running_npm_module.html %}
514514

‎jekyll-www.mock-server.com/mock_server/_includes/running_mock_server_summary.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ <h3>The MockServer and MockServer Proxy can be run:</h3>
66
<li>using a <a href="/mock_server/running_mock_server.html#junit_rule"><strong>JUnit @Rule</strong></a> via a <span class="annotation">@Rule</span> annotated field in a JUnit test</li>
77
<li>from the <a href="/mock_server/running_mock_server.html#running_from_command_line"><strong>command line</strong></a> as a stand-alone process in a test environment</li>
88
<li>as a <a href="/mock_server/running_mock_server.html#deployable_war"><strong>deployable WAR</strong></a> to an existing application server</li>
9-
<li>as a <a href="/mock_server/running_mock_server.html#mockserver_grunt"><strong>Grunt plugin</strong></a> as part of a Grunt build cycle</li>
109
<li>as a <a href="/mock_server/running_mock_server.html#mockserver_grunt"><strong>Node.js (npm) module</strong></a> from any Node.js code</li>
10+
<li>as a <a href="/mock_server/running_mock_server.html#mockserver_grunt"><strong>Grunt plugin</strong></a> as part of a Grunt build cycle</li>
1111
<li>as a <a href="/mock_server/running_mock_server.html#docker_container"><strong>Docker container</strong></a> in any Docker enabled environment</li>
1212
</ul>
1313

@@ -17,8 +17,8 @@ <h3>MockServer and MockServer Proxy is available as:</h3>
1717
<li>a stand alone <a href="http://search.maven.org/remotecontent?filepath=org/mock-server/mockserver-netty/4.0.0/mockserver-netty-4.0.0-jar-with-dependencies.jar">Netty web server</a> that is fully self contained</li>
1818
<li>a <a href="http://search.maven.org/remotecontent?filepath=org/mock-server/mockserver-war/4.0.0/mockserver-war-4.0.0.war">deployable WAR</a> that runs on any JEE web server</li>
1919
<li>a <a href="#maven_plugin">maven plugin</a></li>
20-
<li>a <a href="https://www.npmjs.org/package/mockserver-grunt">Grunt plugin</a></li>
21-
<li>an <a href="https://www.npmjs.org/package/mockserver-grunt">npm plugin</a></li>
20+
<li>an <a href="https://www.npmjs.org/package/mockserver-node">npm plugin</a></li>
21+
<li>a <a href="https://www.npmjs.org/package/mockserver-node">Grunt plugin</a></li>
2222
<li>a fully encapsulated <a href="https://registry.hub.docker.com/u/jamesdbloom/mockserver/">Docker container</a></li>
2323
<li>a <a href="#running_from_command_line_using_homebrew">Homebrew package</a></li>
2424
</ul>

‎jekyll-www.mock-server.com/mock_server/_includes/running_npm_module.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22

33
<p>You may install this plugin / node module with the following command:</p>
44

5-
<pre><code class="code">npm install mockserver-grunt --save-dev</code></pre>
5+
<pre><code class="code">npm install mockserver-node --save-dev</code></pre>
66

77
<p><strong>Node Module</strong></p>
88

9-
<p>To start or stop the MockServer from any Node.js code you need to import this module using <span class="inline_code">require(<span class="string_literal">'mockserver-grunt'</span>)</span> as follows:</p>
9+
<p>To start or stop the MockServer from any Node.js code you need to import this module using <span class="inline_code">require(<span class="string_literal">'mockserver-node'</span>)</span> as follows:</p>
1010

11-
<pre><code class="code">var mockserver = require(<span class="string_literal">'mockserver-grunt'</span>);</code></pre>
11+
<pre><code class="code">var mockserver = require(<span class="string_literal">'mockserver-node'</span>);</code></pre>
1212

1313
<p>Then you can use either the <span class="inline_code">start_mockserver</span> or <span class="inline_code">stop_mockserver</span> functions as follows:</p>
1414

15-
<pre><code class="code">var mockserver = require(<span class="string_literal">'mockserver-grunt'</span>);
15+
<pre><code class="code">var mockserver = require(<span class="string_literal">'mockserver-node'</span>);
1616
mockserver.start_mockserver({
1717
serverPort: <span class="numeric_literal">1080</span>,
1818
proxyPort: <span class="numeric_literal">1090</span>,
@@ -57,7 +57,7 @@
5757
}
5858
});
5959

60-
grunt.loadNpmTasks(<span class="string_literal">'mockserver-grunt'</span>);</code></pre>
60+
grunt.loadNpmTasks(<span class="string_literal">'mockserver-node'</span>);</code></pre>
6161

6262
<p><strong>Grunt Plugin & NPM Module Options</strong></p>
6363

‎jekyll-www.mock-server.com/mock_server/debugging_issues.html

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ <h2>Logging</h2>
3737

3838
<p>The <strong>TRACE</strong> level logging results in a lot of verbose logging but can be very helpful to debug why a complex matcher (such as the JSON Schema matcher) is not matching.</p>
3939

40-
<p>When MockServer is run from the command line, Maven plugin, Grunt plugin or npm module the log is written to a file called <strong>mockserver.log</strong> in the current working directory where the MockServer is running.</p>
40+
<p>When MockServer is run from the command line, Maven plugin, npm module or Grunt plugin the log is written to a file called <strong>mockserver.log</strong> in the current working directory where the MockServer is running.</p>
4141

4242
<a name="logging_with_api" class="anchor" href="#logging_with_api">&nbsp;</a>
4343

@@ -102,10 +102,10 @@ <h3>Logging with Maven Plugin</h3>
102102

103103
<a name="logging-with-node" class="anchor" href="#logging-with-node">&nbsp;</a>
104104

105-
<h3>Logging with Grunt plugin or npm module</h3>
105+
<h3>Logging with npm module or Grunt plugin</h3>
106106

107-
<p>When running MockServer using the <a href="/mock_server/running_mock_server.html#mockserver_grunt"><strong>mockserver-grunt</strong></a> Grunt plugin and Node.js (npm) module the <span class="inline_code">verbose</span> option can be used to enable <strong>INFO</strong> level logging and the
108-
<span class="inline_code">trace</span> option can be used to enable <strong>TRACE</strong> level logging. In addition the <span class="inline_code">--verbose</span> command line flag can be used for Grunt builds to enable the <strong>mockserver-grunt</strong> verbose option dynamically.</p>
107+
<p>When running MockServer using the <a href="/mock_server/running_mock_server.html#mockserver_grunt"><strong>mockserver-node</strong></a> Grunt plugin and Node.js (npm) module the <span class="inline_code">verbose</span> option can be used to enable <strong>INFO</strong> level logging and the
108+
<span class="inline_code">trace</span> option can be used to enable <strong>TRACE</strong> level logging. In addition the <span class="inline_code">--verbose</span> command line flag can be used for Grunt builds to enable the <strong>mockserver-node</strong> verbose option dynamically.</p>
109109

110110
<a name="disabling-logging" class="anchor" href="#disabling-logging">&nbsp;</a>
111111

@@ -207,13 +207,13 @@ <h3>Debugging Maven Plugin</h3>
207207

208208
<a name="debugging-with-node" class="anchor" href="#debugging-with-node">&nbsp;</a>
209209

210-
<h3>Debugging Grunt plugin or npm module</h3>
210+
<h3>Debugging npm module or Grunt plugin</h3>
211211

212-
<p>To debug the Grunt plugin or npm module you need to provide the <span class="inline_code">javaDebugPort</span> option. This option will enable the following command line switch <span class="inline_code">'-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=' + options.javaDebugPort</span>.</p>
212+
<p>To debug the npm module or Grunt plugin you need to provide the <span class="inline_code">javaDebugPort</span> option. This option will enable the following command line switch <span class="inline_code">'-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=' + options.javaDebugPort</span>.</p>
213213

214214
<p>For example debug <strong>node module</strong>, as follows:</p>
215215

216-
<pre><code class="code">var mockserver = require(<span class="string_literal">'mockserver-grunt'</span>);
216+
<pre><code class="code">var mockserver = require(<span class="string_literal">'mockserver-node'</span>);
217217
mockserver.start_mockserver({
218218
serverPort: <span class="numeric_literal">1080</span>,
219219
proxyPort: <span class="numeric_literal">1090</span>,
@@ -243,4 +243,4 @@ <h3>Debugging Grunt plugin or npm module</h3>
243243
}
244244
});
245245

246-
grunt.loadNpmTasks(<span class="string_literal">'mockserver-grunt'</span>);</code></pre>
246+
grunt.loadNpmTasks(<span class="string_literal">'mockserver-node'</span>);</code></pre>

‎jekyll-www.mock-server.com/mock_server/isolating_single_service.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@
3131
<span class="string_literal">"version"</span>: <span class="string_literal">"1.0.0"</span>,
3232
<span class="string_literal">"main"</span>: <span class="string_literal">"index.js"</span>,
3333
<span class="string_literal">"dependencies"</span>: {
34-
<span class="string_literal">"mockserver-grunt"</span>: <span class="string_literal">"~1"</span>,
34+
<span class="string_literal">"mockserver-node"</span>: <span class="string_literal">"~1"</span>,
3535
<span class="string_literal">"mockserver-client"</span>: <span class="string_literal">"~1"</span>
3636
}
3737
}</code></pre>
3838

3939
<p>Then create the <strong>index.js</strong> file that starts MockServer and sets up the forwarding rules as different expectations, as follows:</p>
4040

41-
<pre><code class="code"><span class="keyword">var</span> mockserver = require(<span class="string_literal">'mockserver-grunt'</span>);
41+
<pre><code class="code"><span class="keyword">var</span> mockserver = require(<span class="string_literal">'mockserver-node'</span>);
4242
<span class="keyword">var</span> mockServerClient = require(<span class="string_literal">'mockserver-client'</span>).mockServerClient;
4343
<span class="keyword">var</span> HTTP_PORT = <span class="numeric_literal">1080</span>;
4444

‎jekyll-www.mock-server.com/where/npm.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ <h2>Node Packaged Modules (npm)</h2>
1515
<p>npm contains the following modules:<p>
1616

1717
<ul>
18-
<li><a href="https://www.npmjs.org/package/mockserver-grunt">mockserver-grunt</a> - node module and grunt taks to start and stop MockServer and its proxy&nbsp;&nbsp;<a href="http://badge.fury.io/js/mockserver-grunt"><img src="https://badge.fury.io/js/mockserver-grunt.png" alt="npm version" height="18"></a>&nbsp;<a href="http://badge.fury.io/bo/mockserver-grunt"></a></li>
18+
<li><a href="https://www.npmjs.org/package/mockserver-node">mockserver-node</a> - node module and grunt taks to start and stop MockServer and its proxy&nbsp;&nbsp;<a href="http://badge.fury.io/js/mockserver-node"><img src="https://badge.fury.io/js/mockserver-node.png" alt="npm version" height="18"></a>&nbsp;<a href="http://badge.fury.io/bo/mockserver-node"></a></li>
1919
<li><a href="https://www.npmjs.org/package/mockserver-client">mockserver-client</a> - node client for MockServer and its proxy&nbsp;&nbsp;<a href="http://badge.fury.io/js/mockserver-client"><img src="https://badge.fury.io/js/mockserver-client.png" alt="npm version" height="18"></a>&nbsp;<a href="http://badge.fury.io/bo/mockserver-client"></a></li>
2020
</ul>
2121

22-
<h2>Running MockServer With mockserver-grunt</h2>
22+
<h2>Running MockServer With mockserver-node</h2>
2323

2424
{% include_subpage ../mock_server/_includes/running_npm_module.html %}

0 commit comments

Comments
 (0)