Skip to content

Commit

Permalink
updated packages and minor refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
alexpopdev committed Aug 29, 2015
1 parent a41f406 commit 22d43bf
Show file tree
Hide file tree
Showing 256 changed files with 5,357 additions and 17,547 deletions.
6 changes: 3 additions & 3 deletions collections/transformations/SpecRunner.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Jasmine Spec Runner v2.0.2</title>
<title>Jasmine Spec Runner v2.3.4</title>

<link rel="shortcut icon" type="image/png" href="bower_components/jasmine/images/jasmine_favicon.png">
<link rel="stylesheet" type="text/css" href="bower_components/jasmine/lib/jasmine-core/jasmine.css">
Expand All @@ -17,11 +17,11 @@
<script type="text/javascript" src="bicycleTransformer.js"></script>

<!-- include spec files here... -->
<script type="text/javascript" src="tests/bicycleTransformerSpecs.js"></script>
<script type="text/javascript" src="spec/bicycleTransformerSpec.js"></script>

</head>

<body>
</body>

</html>
</html>
8 changes: 4 additions & 4 deletions collections/transformations/bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
"tests"
],
"dependencies": {
"jquery": "1.11.1",
"underscore": "1.7.0"
"jquery": "2.1.4",
"underscore": "1.8.3"
},
"devDependencies": {
"jasmine": "2.0.2"
"jasmine": "2.3.4"
}
}
}
53 changes: 44 additions & 9 deletions collections/transformations/bower_components/jasmine/.bower.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,50 @@
{
"name": "jasmine",
"homepage": "https://github.com/pivotal/jasmine",
"version": "2.0.2",
"_release": "2.0.2",
"name": "jasmine-core",
"version": "2.3.4",
"homepage": "http://jasmine.github.io",
"authors": [
"slackersoft <[email protected]>"
],
"description": "Official packaging of Jasmine's core files",
"keywords": [
"test",
"jasmine",
"tdd",
"bdd"
],
"license": "MIT",
"moduleType": "globals",
"main": "lib/jasmine-core/jasmine.js",
"ignore": [
"**/.*",
"dist",
"grunt",
"node_modules",
"pkg",
"release_notes",
"spec",
"src",
"Gemfile",
"Gemfile.lock",
"Rakefile",
"jasmine-core.gemspec",
"*.sh",
"*.py",
"Gruntfile.js",
"lib/jasmine-core.rb",
"lib/jasmine-core/boot/",
"lib/jasmine-core/spec",
"lib/jasmine-core/version.rb",
"lib/jasmine-core/*.py",
"sauce_connect.log"
],
"_release": "2.3.4",
"_resolution": {
"type": "version",
"tag": "v2.0.2",
"commit": "0c8056cca7acc8170b62cc8573f73c557478111c"
"tag": "v2.3.4",
"commit": "651426b6583020e2f3fdae56d2873514963ba65e"
},
"_source": "git://github.com/pivotal/jasmine.git",
"_target": "2.0.2",
"_originalSource": "jasmine",
"_direct": true
"_target": "2.3.4",
"_originalSource": "jasmine"
}
24 changes: 0 additions & 24 deletions collections/transformations/bower_components/jasmine/.gitignore

This file was deleted.

This file was deleted.

This file was deleted.

20 changes: 0 additions & 20 deletions collections/transformations/bower_components/jasmine/.npmignore

This file was deleted.

This file was deleted.

51 changes: 0 additions & 51 deletions collections/transformations/bower_components/jasmine/.travis.yml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,23 +1,28 @@
# Developing for Jasmine Core

We welcome your contributions - Thanks for helping make Jasmine a better project for everyone. Please review the backlog and discussion lists (the main group - [http://groups.google.com/group/jasmine-js](http://groups.google.com/group/jasmine-js) and the developer's list - [http://groups.google.com/group/jasmine-js-dev](http://groups.google.com/group/jasmine-js-dev)) before starting work - what you're looking for may already have been done. If it hasn't, the community can help make your contribution better.
We welcome your contributions! Thanks for helping make Jasmine a better project for everyone. Please review the backlog and discussion lists before starting work. What you're looking for may already have been done. If it hasn't, the community can help make your contribution better.

## Links

- [Jasmine Google Group](http://groups.google.com/group/jasmine-js)
- [Jasmine-dev Google Group](http://groups.google.com/group/jasmine-js-dev)
- [Jasmine on PivotalTracker](https://www.pivotaltracker.com/n/projects/10606)

## General Workflow

Please submit pull requests via feature branches using the semi-standard workflow of:

1. Fork it
1. Clone your fork: (`git clone [email protected]:yourUserName/jasmine.git`)
1. Change directory: (`cd jasmine`)
1. Asign original repository to a remote named 'upstream': (`git remote add
upstream https://github.com/pivotal/jasmine.git`)
1. Pull in changes not present in your local repository: (`git fetch upstream`)
1. Create your feature branch (`git checkout -b my-new-feature`)
1. Commit your changes (`git commit -am 'Add some feature'`)
1. Push to the branch (`git push origin my-new-feature`)
1. Create new Pull Request
```bash
git clone [email protected]:yourUserName/jasmine.git # Clone your fork
cd jasmine # Change directory
git remote add upstream https://github.com/jasmine/jasmine.git # Assign original repository to a remote named 'upstream'
git fetch upstream # Pull in changes not present in your local repository
git checkout -b my-new-feature # Create your feature branch
git commit -am 'Add some feature' # Commit your changes
git push origin my-new-feature # Push to the branch
```

We favor pull requests with very small, single commits with a single purpose.
Once you've pushed a feature branch to your forked repo, you're ready to open a pull request. We favor pull requests with very small, single commits with a single purpose.

## Background

Expand Down Expand Up @@ -67,7 +72,11 @@ To install the Ruby dependencies, you will need Ruby, Rubygems, and Bundler avai

$ bundle

...will install all of the Ruby dependencies.
...will install all of the Ruby dependencies. If the ffi gem fails to build its native extensions, you may need to manually install some system dependencies. On Ubuntu:

$ apt-get install gcc ruby ruby-dev libxml2 libxml2-dev libxslt1-dev

...should get you to the point that `bundle` can install everything.

To install the Node dependencies, you will need Node.js, Npm, and [Grunt](http://gruntjs.com/), the [grunt-cli](https://github.com/gruntjs/grunt-cli) and ensure that `grunt` is on your path.

Expand All @@ -94,13 +103,13 @@ Follow these tips and your pull request, patch, or suggestion is much more likel

### Running Specs

Jasmine uses the [Jasmine Ruby gem](http://github.com/pivotal/jasmine-gem) to test itself in browser.
Jasmine uses the [Jasmine Ruby gem](http://github.com/jasmine/jasmine-gem) to test itself in browser.

$ rake jasmine

...and then visit `http://localhost:8888` to run specs.

Jasmine uses Node.js with a custom runner to test outside of a browser.
Jasmine uses the [Jasmine NPM package](http://github.com/jasmine/jasmine-npm) to test itself in a Node.js/npm environment.

$ grunt execSpecsInNode

Expand All @@ -114,8 +123,8 @@ Jasmine uses Node.js with a custom runner to test outside of a browser.

## Submitting a Pull Request
1. Revert your changes to `jasmine.js` and `jasmine-html.js`
* We do this because `jasmine.js` and `jasmine-html.js` are auto-generated (as you've seen in the previous steps) and accepting multiple pull requests when this auto-generated file changes causes lots of headaches.
1. When we accept your pull request, we will generate these files as a separate commit and merge the entire branch into master.
* We do this because `jasmine.js` and `jasmine-html.js` are auto-generated (as you've seen in the previous steps) and accepting multiple pull requests when this auto-generated file changes causes lots of headaches
1. When we accept your pull request, we will generate these files as a separate commit and merge the entire branch into master

Note that we use Travis for Continuous Integration. We only accept green pull requests.

12 changes: 0 additions & 12 deletions collections/transformations/bower_components/jasmine/Gemfile

This file was deleted.

53 changes: 0 additions & 53 deletions collections/transformations/bower_components/jasmine/Gruntfile.js

This file was deleted.

Loading

0 comments on commit 22d43bf

Please sign in to comment.