Skip to content
This repository was archived by the owner on Apr 4, 2025. It is now read-only.

Tidy and update repo #123

Closed
wants to merge 12 commits into from
Closed
Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
/node_modules/
/dist/
/.idea/
/yarn-error.log
14 changes: 9 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
sudo: false
language: node_js
node_js:
- 0.10
- 6

cache: yarn

env:
matrix:
- VERSION=1.2
- VERSION=1.3
- VERSION=1.4
- VERSION=1.5
- VERSION=1.6
global:
- BROWSER_PROVIDER_READY_FILE=/tmp/sauce-connect-ready
- LOGS_DIR=/tmp/angular-hint-build/logs
Expand All @@ -15,10 +21,8 @@ env:
install:
- mkdir -p $LOGS_DIR
- ./scripts/sauce_connect_setup.sh
- npm install -g npm
- npm install
- npm install -g karma-cli
- ./npm-install.sh
- yarn install --ignore-engines
- ./scripts/npm-install.sh
- ./scripts/wait_for_browser_provider.sh

script:
Expand Down
40 changes: 10 additions & 30 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,7 @@ Please read and follow our [Code of Conduct](https://github.com/angular/code-of-
## <a name="issue"></a> Open an Issue

If you find a bug in AngularHint, you can help us by submitting an issue to our
[GitHub Repository](https://github.com/angular/angular-hint). If you can trace the issue to a specific AngularHint module, please go
to the module's repository to submit the issue. The current repositories for AngularHint modules are:
- [Angular Hint Controllers](https://github.com/angular/angular-hint-controllers)
- [Angular Hint Directives](https://github.com/angular/angular-hint-directives)
- [Angular Hint DOM](https://github.com/angular/angular-hint-dom)
- [Angular Hint Events](https://github.com/angular/angular-hint-events)
- [Angular Hint Interpolation](https://github.com/angular/angular-hint-interpolation)
- [Angular Hint Modules](https://github.com/angular/angular-hint-modules)

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess all these repos have been consumed into this one?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TBH, I have no idea what happened to them 😁
I know the repositories do not exist any more (although they used to) and src/modules has some files that seem to correspond to some (although not all) of the modules. So I assume some got merged, some got removed(?).

[GitHub Repository](https://github.com/angular/angular-hint).

To help us effectively address your issue, please follow these steps:
1. Use GitHub to search for duplicate issues. If a similar issue already exists, add more
Expand Down Expand Up @@ -56,33 +49,21 @@ send us a Pull Request. Following these steps will help us to include your code:
```
3. Create your patch, **including appropriate test cases**
4. Follow our [Coding Style Guidelines](#style)
5. Run the AngularHint protractor testing suite using the `gulp` command, or run an AngularHint
module's unit tests using `karma start`. Ensure that all tests pass.
5. Run the AngularHint protractor testing suite using `yarn test-e2e`, or run an AngularHint
module's unit tests using `yarn test-unit`. Ensure that all tests pass.
6. Commit your changes using a descriptive commit message that follows our [commit guidelines](#commit)

```shell
git commit -a
```
Note: the optional commit `-a` command line option will automatically "add" and "rm" edited files.
7. Build your changes locally to ensure all the tests pass
For AngularHint:

```shell
gulp

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you no longer need to check in built files?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I haven't changed anything in that regard. But this step is run after you have commited your changes so it is not about including built files in the commit. This step just seemed a duplicate of step 5 (running tests), with extra info about modules, which do not exist any more.

(Also note that the default gulp task runs the tests.)

```

For an AngularHint module:

```shell
karma start
```
8. Push your branch to GitHub:
7. Push your branch to GitHub:

```shell
git push origin my-fix-branch
```
9. In GitHub, send a pull request to AngularHint or the appropriate AngularHint module
10. If we suggest changes then:
8. In GitHub, send a pull request to AngularHint.
9. If we suggest changes then:
- Make the required updates
- Re-run the tests and ensure they are still passing
- Rebase your branch and force push to your GitHub repository (this will update your PR):
Expand All @@ -91,7 +72,7 @@ send us a Pull Request. Following these steps will help us to include your code:
git rebase master -i
git push -f
```
11. After your pull request is merged you can delete your branch an pull the changes from the
10. After your pull request is merged you can delete your branch an pull the changes from the
main repository.

- Delete the remote branch:
Expand Down Expand Up @@ -121,8 +102,7 @@ send us a Pull Request. Following these steps will help us to include your code:

##<a name="style"></a> Coding Style Guidelines

To help keep the code in AngularHint and the AngularHint modules consistent, please follow
these conventions.
To help keep the code in AngularHint consistent, please follow these conventions.

###1. AngularHint Guidelines

Expand All @@ -138,8 +118,8 @@ send us a Pull Request. Following these steps will help us to include your code:

- All features should be covered by appropriate tests. In AngularHint the e2e tests
are run through protractor and contained in the `e2e` directory. In individual AngularHint
modules the unit tests are run through karma. Check the existing tests in the module you are working
with to see the conventions for that module.
modules the unit tests are run through karma. Check the existing tests in the module you are
working with to see the conventions for that module.

#### Coding

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@ Example:
## Building

```shell
$ npm install
$ yarn install
```

```shell
$ npm run build
$ yarn build
```
##Example
In the `example` directory, you can find a sample application that appears
Expand Down
8 changes: 4 additions & 4 deletions config/karma.sauce.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@ var CUSTOM_LAUNCHERS = {
'SL_Chrome': {
base: 'SauceLabs',
browserName: 'chrome',
version: '35'
version: 'latest'
},
'SL_Firefox': {
base: 'SauceLabs',
browserName: 'firefox',
version: '26'
version: 'latest'
},
'SL_Safari': {
base: 'SauceLabs',
browserName: 'safari',
platform: 'OS X 10.9',
version: '7'
platform: 'OS X 10.12',
version: '10'
}
};

Expand Down
4 changes: 0 additions & 4 deletions config/karma.travis.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@ module.exports = function(options) {
options.sauceLabs.tunnelIdentifier = process.env.TRAVIS_JOB_NUMBER;
options.sauceLabs.startConnect = false;

// TODO(vojta): remove once SauceLabs supports websockets.
// This speeds up the capturing a bit, as browsers don't even try to use websocket.
options.transports = ['xhr-polling'];

options.singleRun = true;
};

Expand Down
Loading