Skip to content

Fix http into https at references #1497

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

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
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
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -17,8 +17,8 @@ Feel free to fork this template if you want to keep it alive.

## Documentation

- [For this template](http://vuejs-templates.github.io/webpack): common questions specific to this template are answered and each part is described in greater detail
- [For Vue 2.0](http://vuejs.org/guide/): general information about how to work with Vue, not specific to this template
- [For this template](https://vuejs-templates.github.io/webpack): common questions specific to this template are answered and each part is described in greater detail
- [For Vue 2.0](https://vuejs.org/guide/): general information about how to work with Vue, not specific to this template

## Usage

@@ -62,7 +62,7 @@ The development server will run on port 8080 by default. If that port is already
- Supports ES2015+ in test files.
- Easy mocking.

- `npm run e2e`: End-to-end tests with [Nightwatch](http://nightwatchjs.org/).
- `npm run e2e`: End-to-end tests with [Nightwatch](https://nightwatchjs.org/).
- Run tests in multiple browsers in parallel.
- Works with one command out of the box:
- Selenium and chromedriver dependencies automatically handled.
2 changes: 1 addition & 1 deletion docs/commands.md
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ All build commands are executed via [NPM Scripts](https://docs.npmjs.com/misc/sc

### `npm run e2e`

> Run end-to-end tests with [Nightwatch](http://nightwatchjs.org/). See [End-to-end Testing](e2e.md) for more details.
> Run end-to-end tests with [Nightwatch](https://nightwatchjs.org/). See [End-to-end Testing](e2e.md) for more details.

- Run tests in multiple browsers in parallel.
- Works with one command out of the box:
10 changes: 5 additions & 5 deletions docs/e2e.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# End-to-end Testing

This boilerplate uses [Nightwatch.js](http://nightwatchjs.org) for e2e tests. Nightwatch.js is a highly integrated e2e test runner built on top of Selenium. This boilerplate comes with Selenium server and chromedriver binaries pre-configured for you, so you don't have to mess with these yourself.
This boilerplate uses [Nightwatch.js](https://nightwatchjs.org) for e2e tests. Nightwatch.js is a highly integrated e2e test runner built on top of Selenium. This boilerplate comes with Selenium server and chromedriver binaries pre-configured for you, so you don't have to mess with these yourself.

Let's take a look at the files in the `test/e2e` directory:

@@ -10,16 +10,16 @@ Let's take a look at the files in the `test/e2e` directory:

- `nightwatch.conf.js`

Nightwatch configuration file. See [Nightwatch's docs on configuration](http://nightwatchjs.org/gettingstarted#settings-file) for more details.
Nightwatch configuration file. See [Nightwatch's docs on configuration](https://nightwatchjs.org/gettingstarted#settings-file) for more details.

- `custom-assertions/`

Custom assertions that can be used in Nightwatch tests. See [Nightwatch's docs on writing custom assertions](http://nightwatchjs.org/guide#writing-custom-assertions) for more details.
Custom assertions that can be used in Nightwatch tests. See [Nightwatch's docs on writing custom assertions](https://nightwatchjs.org/guide#writing-custom-assertions) for more details.

- `specs/`

Your actual tests! See [Nightwatch's docs on writing tests](http://nightwatchjs.org/guide#writing-tests) and [API reference](http://nightwatchjs.org/api) for more details.
Your actual tests! See [Nightwatch's docs on writing tests](https://nightwatchjs.org/guide#writing-tests) and [API reference](https://nightwatchjs.org/api) for more details.

### Running Tests in More Browsers

To configure which browsers to run the tests in, add an entry under "test_settings" in [`test/e2e/nightwatch.conf.js`](https://github.com/vuejs-templates/webpack/blob/master/template/test/e2e/nightwatch.conf.js#L17-L39) , and also the `--env` flag in [`test/e2e/runner.js`](https://github.com/vuejs-templates/webpack/blob/master/template/test/e2e/runner.js#L15). If you wish to configure remote testing on services like SauceLabs, you can either make the Nightwatch config conditional based on environment variables, or use a separate config file altogether. Consult [Nightwatch's docs on Selenium](http://nightwatchjs.org/guide#selenium-settings) for more details.
To configure which browsers to run the tests in, add an entry under "test_settings" in [`test/e2e/nightwatch.conf.js`](https://github.com/vuejs-templates/webpack/blob/master/template/test/e2e/nightwatch.conf.js#L17-L39) , and also the `--env` flag in [`test/e2e/runner.js`](https://github.com/vuejs-templates/webpack/blob/master/template/test/e2e/runner.js#L15). If you wish to configure remote testing on services like SauceLabs, you can either make the Nightwatch config conditional based on environment variables, or use a separate config file altogether. Consult [Nightwatch's docs on Selenium](https://nightwatchjs.org/guide#selenium-settings) for more details.
2 changes: 1 addition & 1 deletion docs/pre-processors.md
Original file line number Diff line number Diff line change
@@ -41,7 +41,7 @@ module.exports = {
}
```

See [vue-loader's related documentation](http://vuejs.github.io/vue-loader/en/features/postcss.html) for more details.
See [vue-loader's related documentation](https://vuejs.github.io/vue-loader/en/features/postcss.html) for more details.

### Standalone CSS Files

6 changes: 3 additions & 3 deletions docs/proxy.md
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ module.exports = {
proxyTable: {
// proxy all requests starting with /api to jsonplaceholder
'/api': {
target: 'http://jsonplaceholder.typicode.com',
target: 'https://jsonplaceholder.typicode.com',
changeOrigin: true,
pathRewrite: {
'^/api': ''
@@ -23,7 +23,7 @@ module.exports = {
}
```

The above example will proxy the request `/api/posts/1` to `http://jsonplaceholder.typicode.com/posts/1`.
The above example will proxy the request `/api/posts/1` to `https://jsonplaceholder.typicode.com/posts/1`.

## URL Matching

@@ -32,7 +32,7 @@ In addition to static urls you can also use glob patterns to match URLs, e.g. `/
``` js
proxyTable: {
'**': {
target: 'http://jsonplaceholder.typicode.com',
target: 'https://jsonplaceholder.typicode.com',
filter: function (pathname, req) {
return pathname.match('^/api') && req.method === 'GET'
}
2 changes: 1 addition & 1 deletion docs/structure.md
Original file line number Diff line number Diff line change
@@ -49,7 +49,7 @@ This is the main configuration file that exposes some of the most common configu

### `src/`

This is where most of your application code will live in. How to structure everything inside this directory is largely up to you; if you are using Vuex, you can consult the [recommendations for Vuex applications](http://vuex.vuejs.org/en/structure.html).
This is where most of your application code will live in. How to structure everything inside this directory is largely up to you; if you are using Vuex, you can consult the [recommendations for Vuex applications](https://vuex.vuejs.org/en/structure.html).

### `static/`

6 changes: 3 additions & 3 deletions docs/unit.md
Original file line number Diff line number Diff line change
@@ -25,8 +25,8 @@ The Jest boilerplate comes with the ability to mock dependencies. See the [mock
- [Karma](https://karma-runner.github.io/): the test runner that launches browsers, runs the tests and reports the results to us.
- [karma-webpack](https://github.com/webpack/karma-webpack): the plugin for Karma that bundles our tests using Webpack.
- [Mocha](https://mochajs.org/): the test framework that we write test specs with.
- [Chai](http://chaijs.com/): test assertion library that provides better assertion syntax.
- [Sinon](http://sinonjs.org/): test utility library that provides spies, stubs and mocks.
- [Chai](https://chaijs.com/): test assertion library that provides better assertion syntax.
- [Sinon](https://sinonjs.org/): test utility library that provides spies, stubs and mocks.

Chai and Sinon are integrated using [karma-sinon-chai](https://github.com/kmees/karma-sinon-chai), so all Chai interfaces (`should`, `expect`, `assert`) and `sinon` are globally available in test files.

@@ -50,4 +50,4 @@ You can run the tests in multiple real browsers by installing more [karma launch

### Mocking Dependencies

The Karma unit test boilerplate comes with [inject-loader](https://github.com/plasticine/inject-loader) installed by default. For usage with `*.vue` components, see [vue-loader docs on testing with mocks](http://vue-loader.vuejs.org/en/workflow/testing-with-mocks.html).
The Karma unit test boilerplate comes with [inject-loader](https://github.com/plasticine/inject-loader) installed by default. For usage with `*.vue` components, see [vue-loader docs on testing with mocks](https://vue-loader.vuejs.org/en/workflow/testing-with-mocks.html).
2 changes: 1 addition & 1 deletion template/README.md
Original file line number Diff line number Diff line change
@@ -33,4 +33,4 @@ npm test
{{/if_or}}
```

For a detailed explanation on how things work, check out the [guide](http://vuejs-templates.github.io/webpack/) and [docs for vue-loader](http://vuejs.github.io/vue-loader).
For a detailed explanation on how things work, check out the [guide](https://vuejs-templates.github.io/webpack/) and [docs for vue-loader](https://vuejs.github.io/vue-loader).
4 changes: 2 additions & 2 deletions template/build/webpack.prod.conf.js
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ const webpackConfig = merge(baseWebpackConfig, {
chunkFilename: utils.assetsPath('js/[id].[chunkhash].js')
},
plugins: [
// http://vuejs.github.io/vue-loader/en/workflow/production.html
// https://vuejs.github.io/vue-loader/en/workflow/production.html
new webpack.DefinePlugin({
'process.env': env
}),
@@ -48,7 +48,7 @@ const webpackConfig = merge(baseWebpackConfig, {
filename: utils.assetsPath('css/[name].[contenthash].css'),
// Setting the following option to `false` will not extract CSS from codesplit chunks.
// Their CSS will instead be inserted dynamically with style-loader when the codesplit chunk has been loaded by webpack.
// It's currently set to `true` because we are seeing that sourcemaps are included in the codesplit bundle as well when it's `false`,
// It's currently set to `true` because we are seeing that sourcemaps are included in the codesplit bundle as well when it's `false`,
// increasing file size: https://github.com/vuejs-templates/webpack/issues/1110
allChunks: true,
}),
2 changes: 1 addition & 1 deletion template/config/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict'
// Template version: {{ template_version }}
// see http://vuejs-templates.github.io/webpack for documentation.
// see https://vuejs-templates.github.io/webpack for documentation.

const path = require('path')

8 changes: 4 additions & 4 deletions template/src/components/HelloWorld.vue
Original file line number Diff line number Diff line change
@@ -38,7 +38,7 @@
<br>
<li>
<a
href="http://vuejs-templates.github.io/webpack/"
href="https://vuejs-templates.github.io/webpack/"
target="_blank"
>
Docs for This Template
@@ -49,23 +49,23 @@
<ul>
<li>
<a
href="http://router.vuejs.org/"
href="https://router.vuejs.org/"
target="_blank"
>
vue-router
</a>
</li>
<li>
<a
href="http://vuex.vuejs.org/"
href="https://vuex.vuejs.org/"
target="_blank"
>
vuex
</a>
</li>
<li>
<a
href="http://vue-loader.vuejs.org/"
href="https://vue-loader.vuejs.org/"
target="_blank"
>
vue-loader
2 changes: 1 addition & 1 deletion template/test/e2e/custom-assertions/elementCount.js
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
// browser.assert.elementCount(selector, count)
//
// For more information on custom assertions see:
// http://nightwatchjs.org/guide#writing-custom-assertions
// https://nightwatchjs.org/guide#writing-custom-assertions

exports.assertion = function (selector, count) {
this.message = 'Testing if element <' + selector + '> has count: ' + count
2 changes: 1 addition & 1 deletion template/test/e2e/nightwatch.conf.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require('babel-register')
var config = require('../../config')

// http://nightwatchjs.org/gettingstarted#settings-file
// https://nightwatchjs.org/gettingstarted#settings-file
module.exports = {
src_folders: ['test/e2e/specs'],
output_folder: 'test/e2e/reports',
2 changes: 1 addition & 1 deletion template/test/e2e/runner.js
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ devConfigPromise.then(devConfig => {
// 2. add it to the --env flag below
// or override the environment flag, for example: `npm run e2e -- --env chrome,firefox`
// For more information on Nightwatch's config file, see
// http://nightwatchjs.org/guide#settings-file
// https://nightwatchjs.org/guide#settings-file
let opts = process.argv.slice(2)
if (opts.indexOf('--config') === -1) {
opts = opts.concat(['--config', 'test/e2e/nightwatch.conf.js'])
2 changes: 1 addition & 1 deletion template/test/e2e/specs/test.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// For authoring Nightwatch tests, see
// http://nightwatchjs.org/guide#usage
// https://nightwatchjs.org/guide#usage

module.exports = {
'default e2e tests': function {{#if_eq lintConfig "airbnb"}}test{{/if_eq}}(browser) {
4 changes: 2 additions & 2 deletions template/test/unit/karma.conf.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// This is a karma config file. For more details see
// http://karma-runner.github.io/0.13/config/configuration-file.html
// https://karma-runner.github.io/0.13/config/configuration-file.html
// we are also using it with karma-webpack
// https://github.com/webpack/karma-webpack

@@ -9,7 +9,7 @@ module.exports = function karmaConfig (config) {
config.set({
// to run in additional browsers:
// 1. install corresponding karma launcher
// http://karma-runner.github.io/0.13/config/browsers.html
// https://karma-runner.github.io/0.13/config/browsers.html
// 2. add it to the `browsers` array below.
browsers: ['PhantomJS'],
frameworks: ['mocha', 'sinon-chai', 'phantomjs-shim'],