catmando

git pull   # Start with latest upstream
git checkout -b myfeature   # Do some work in a separate branch
git add the_file
git commit -m 'blah blah blah'   # Make as many commits as needed
# Fetch and rebase when finished (or as often as you want before pushing local changes)
git fetch master   # Get any new upstream changes that may have been pushed
git rebase master   # Plop my commits on top of master/resolve any conflicts
git checkout master
git merge myfeature
git push

catmando

opal-rspec does not currently have a means to change the spec directory location, which you really need to do if you are going to have mixed opal and regular (server) ruby code testing.

The following assumes normal specs will go into the the spec directory, and opal specs will go into spec-opal directory.

To get this to work, you have to change the Opal::Server path to end with spec-opal instead of spec which is what opal-rspec normally does. Then you have to change the Opal::Server main file (the sprockets_runner.rb.erb) file to be a copy which pulls in your specs.

In your rake file do this:

require 'opal/rspec/rake_task'