Permalink
Browse files

trying to make jasmine specs run again

  • Loading branch information...
1 parent 5cf174a commit ac264b71fbe850c98390941e1a9ed9bfee7c210a @apneadiving apneadiving committed May 1, 2012
View
@@ -7,4 +7,5 @@ source "http://rubygems.org"
gemspec
gem 'growl'
-gem 'jquery-rails'
+gem 'jquery-rails'
+gem 'jasmine'
View
@@ -1,6 +1,3 @@
-# A sample Guardfile
-# More info at https://github.com/guard/guard#readme
-
guard 'spork', :rspec_env => { 'RAILS_ENV' => 'test' } do
watch('config/application.rb')
watch('config/environment.rb')
@@ -10,12 +7,11 @@ guard 'spork', :rspec_env => { 'RAILS_ENV' => 'test' } do
watch('Gemfile.lock')
watch('spec/spec_helper.rb') { :rspec }
end
-
guard 'rspec', :cli => "-c -f d", :all_on_start => false, :all_after_pass => false do
watch(%r{^spec/.+_spec\.rb$})
watch('spec/launchers/all_specs.rb') { "spec" }
- watch('spec/launchers/all_but_requests.rb') { ["spec/base", "spec/helpers", "spec/models", "spec/views"] }
+ watch('spec/launchers/all_but_requests.rb') { ["spec/base", "spec/helpers", "spec/models", "spec/views", "spec/javascripts"] }
watch('spec/launchers/requests.rb') { "spec/requests" }
end
@@ -25,14 +21,4 @@ guard 'jasmine', :jasmine_url => 'http://localhost:8888/', :all_on_start => fals
watch(%r{^spec/javascripts/.+_spec\.js$}) { "spec/javascripts" }
end
-
-#--drb
-
-guard 'coffeescript', :input => 'app/assets/javascripts/gmaps4rails', :output => 'public/javascripts/gmaps4rails'
-
-#
-#guard 'coffeescript', :input => 'spec/javascripts/coffee', :output => 'spec/javascripts'
-
-# do
-# watch(/^app\/assets\/javascripts\/gmaps4rails\/(.*).coffee/)
-# end
+guard 'coffeescript', :input => 'app/assets/javascripts/gmaps4rails', :output => 'public/javascripts/gmaps4rails'
View
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
#s.add_development_dependency "capybara"
#s.add_development_dependency 'launchy'
- s.add_development_dependency "jasmine"
+ #s.add_development_dependency "jasmine"
s.add_development_dependency "guard", "~> 1.0.1"
s.add_development_dependency "guard-spork"
@@ -80,7 +80,7 @@ describe("Gmaps4Rails", function() {
for (var i = 0; i < 100; ++i) {
var x = gmap.randomize(0,0);
var distanceInMeters = geoHelpers.getDistanceFromO(x[0], x[1])/1000;
- //this test coul seem weird, but because latitude AND longitude could be moved by 100m, the highest diagonal is 142m
+ //this test could seem weird, but because latitude AND longitude could be moved by 100m, the highest diagonal is 142m
expect(distanceInMeters).toBeLessThan(142);
}
});
@@ -110,13 +110,13 @@ describe("createServiceMarkersFromMarkers full stack", function() {
afterEach(function() {
clearMarkerTraces();
- gmap.map = null;
+ gmap.serviceObject = null;
});
it("should process all attributes from a marker (without default values)", function() {
var marker = getFullMarker();
gmap.markers = [marker];
- gmap.map = "map";
+ gmap.serviceObject = "map";
spyOn(gmap, "createMarker");
@@ -145,7 +145,7 @@ describe("createServiceMarkersFromMarkers full stack", function() {
it("should process all attributes from a marker (with default values)", function() {
var marker = getEmptyMarker();
gmap.markers = [marker];
- gmap.map = "map";
+ gmap.serviceObject = "map";
spyOn(gmap, "createMarker");
@@ -1,76 +1,92 @@
-# src_files
-#
-# Return an array of filepaths relative to src_dir to include before jasmine specs.
-# Default: []
-#
-# EXAMPLE:
-#
+# # src_files
+# #
+# # Return an array of filepaths relative to src_dir to include before jasmine specs.
+# # Default: []
+# #
+# # EXAMPLE:
+# #
+# # src_files:
+# # - lib/source1.js
+# # - lib/source2.js
+# # - dist/**/*.js
+# #
# src_files:
-# - lib/source1.js
-# - lib/source2.js
-# - dist/**/*.js
-#
-src_files:
- - public/javascripts/**/*.js
-
-# stylesheets
-#
-# Return an array of stylesheet filepaths relative to src_dir to include before jasmine specs.
-# Default: []
-#
-# EXAMPLE:
-#
+# - public/javascripts/prototype.js
+# - public/javascripts/effects.js
+# - public/javascripts/controls.js
+# - public/javascripts/dragdrop.js
+# - public/javascripts/application.js
+# - public/javascripts/**/*.js
+#
+# # stylesheets
+# #
+# # Return an array of stylesheet filepaths relative to src_dir to include before jasmine specs.
+# # Default: []
+# #
+# # EXAMPLE:
+# #
+# # stylesheets:
+# # - css/style.css
+# # - stylesheets/*.css
+# #
# stylesheets:
-# - css/style.css
-# - stylesheets/*.css
-#
-stylesheets:
- - stylesheets/**/*.css
-
-# helpers
-#
-# Return an array of filepaths relative to spec_dir to include before jasmine specs.
-# Default: ["helpers/**/*.js"]
-#
-# EXAMPLE:
-#
+# - stylesheets/**/*.css
+#
+# # helpers
+# #
+# # Return an array of filepaths relative to spec_dir to include before jasmine specs.
+# # Default: ["helpers/**/*.js"]
+# #
+# # EXAMPLE:
+# #
+# # helpers:
+# # - helpers/**/*.js
+# #
# helpers:
# - helpers/**/*.js
-#
+#
+# # spec_files
+# #
+# # Return an array of filepaths relative to spec_dir to include.
+# # Default: ["**/*[sS]pec.js"]
+# #
+# # EXAMPLE:
+# #
+# # spec_files:
+# # - **/*[sS]pec.js
+# #
+# spec_files:
+# - '**/*[sS]pec.js'
+#
+# # src_dir
+# #
+# # Source directory path. Your src_files must be returned relative to this path. Will use root if left blank.
+# # Default: project root
+# #
+# # EXAMPLE:
+# #
+# # src_dir: public
+# #
+# src_dir:
+#
+# # spec_dir
+# #
+# # Spec directory path. Your spec_files must be returned relative to this path.
+# # Default: spec/javascripts
+# #
+# # EXAMPLE:
+# #
+# # spec_dir: spec/javascripts
+# #
+# spec_dir: spec/javascripts
+
+src_files:
+ - public/javascripts/**/*.js
+
helpers:
- helpers/**/*.js
-# spec_files
-#
-# Return an array of filepaths relative to spec_dir to include.
-# Default: ["**/*[sS]pec.js"]
-#
-# EXAMPLE:
-#
-# spec_files:
-# - **/*[sS]pec.js
-#
spec_files:
- '**/*[sS]pec.js'
-# src_dir
-#
-# Source directory path. Your src_files must be returned relative to this path. Will use root if left blank.
-# Default: project root
-#
-# EXAMPLE:
-#
-# src_dir: public
-#
-src_dir:
-
-# spec_dir
-#
-# Spec directory path. Your spec_files must be returned relative to this path.
-# Default: spec/javascripts
-#
-# EXAMPLE:
-#
-# spec_dir: spec/javascripts
-#
spec_dir: spec/javascripts

0 comments on commit ac264b7

Please sign in to comment.