Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Don't force the use of jQuery

  • Loading branch information...
commit 355bddc860d639a6f8ce307293dcb126a81b1012 1 parent cf17573
@jfirebaugh authored
View
5 Gemfile
@@ -1,7 +1,2 @@
source 'https://rubygems.org'
gemspec
-
-# This is a runtime dependency in the gemspec, so it shouldn't be necessary to
-# specify it again, but bundler is buggy:
-# https://github.com/carlhuda/bundler/issues/1041
-gem "jquery-rails"
View
1  History.md
@@ -3,6 +3,7 @@
* Do not time out after 300 seconds
* Rename #test div to #konacha
* Update vendored copies of mocha (1.0.0+) and chai (0.5.2+)
+* jQuery is no longer included by default
# 0.10.0
View
2  app/views/konacha/specs/specs.html.erb
@@ -5,7 +5,7 @@
<title>Konacha Tests</title>
<%= stylesheet_link_tag "mocha", :debug => false %>
<%= stylesheet_link_tag "konacha", :debug => false %>
- <%= javascript_include_tag "jquery", "mocha", "chai", "konacha/#{Konacha.mode}", :debug => false %>
+ <%= javascript_include_tag "mocha", "chai", "konacha/#{Konacha.mode}", :debug => false %>
<script>
mocha.setup({ui: <%= raw Konacha.interface.to_json %>, reporter: Konacha.Reporter});
View
2  konacha.gemspec
@@ -19,10 +19,10 @@ the asset pipeline and engines.}
gem.require_paths = ["lib"]
gem.version = "0.10.0"
- gem.add_dependency "jquery-rails"
gem.add_dependency "rails", "~> 3.1"
gem.add_dependency "capybara"
+ gem.add_development_dependency "jquery-rails"
gem.add_development_dependency "rspec-rails"
gem.add_development_dependency "capybara-firebug", "~> 1.1"
gem.add_development_dependency "coffee-script"
View
1  spec/dummy/spec/javascripts/templating_spec.js
@@ -1,4 +1,5 @@
//= require spec_helper
+//= require jquery
describe("templating", function(){
it("is built in to Sprockets", function(){
View
2  spec/dummy/spec/javascripts/test_element_spec.js.coffee
@@ -1,3 +1,5 @@
+#= require jquery
+
describe "the #konacha element", ->
it "can have content added in one test...", ->
$('#konacha').append('<h1 id="added">New Stuff</h1>')
Please sign in to comment.
Something went wrong with that request. Please try again.