Permalink
Browse files

Fixed the example.

  • Loading branch information...
1 parent 4965458 commit efbf242a6ad31d1f59f5ec52883778157048cc7c Grockit committed Sep 3, 2009
Showing with 58 additions and 2,094 deletions.
  1. +0 −8 .braids
  2. +1 −1 .screwrc
  3. +0 −6 History.txt
  4. +0 −63 Manifest.txt
  5. 0 client/lib/screw/jquery_mapper.js
  6. +3 −3 example/.screwrc
  7. +2 −0 example/lib/example.js
  8. 0 example/{ → lib}/models/cat.js
  9. +3 −3 example/{ → lib}/models/man.js
  10. +2 −2 example/spec/models/cat_spec.js
  11. +6 −6 example/spec/models/man_spec.js
  12. +3 −4 example/spec/spec_helper.js
  13. +3 −3 example/spec/suite.html
  14. +0 −358 javascript/lib/disco.js
  15. +0 −5 javascript/lib/screw/jquery_mapper.js
  16. +0 −1 lib/screw_unit.rb
  17. +0 −3 lib/screw_unit/asset_manager.rb
  18. +3 −1 lib/screw_unit/configuration.rb
  19. +1 −1 lib/screw_unit/resources/dir.rb
  20. +14 −14 spec/screw_unit/asset_manager_spec.rb
  21. 0 spec/screw_unit/asset_manager_spec/dir_1/subdir_1/4.js
  22. 0 spec/screw_unit/asset_manager_spec/dir_3/subdir_3/5.js
  23. 0 spec/screw_unit/{asset_manager_spec → file_system_fixtures_for_asset_manager_specs}/dir_1/1.js
  24. 0 ...ndent_sources → spec/screw_unit/file_system_fixtures_for_asset_manager_specs/dir_1/subdir_1}/4.js
  25. 0 spec/screw_unit/{asset_manager_spec → file_system_fixtures_for_asset_manager_specs}/dir_2/2.js
  26. 0 spec/screw_unit/{asset_manager_spec → file_system_fixtures_for_asset_manager_specs}/dir_3/3.js
  27. 0 ...ndent_sources → spec/screw_unit/file_system_fixtures_for_asset_manager_specs/dir_3/subdir_3}/5.js
  28. 0 spec/screw_unit/{asset_manager_spec → file_system_fixtures_for_asset_manager_specs}/dir_4/1.css
  29. +5 −5 spec/screw_unit/js_file_spec.rb
  30. +9 −5 spec/screw_unit/resources/dir_spec.rb
  31. +1 −1 spec/screw_unit/resources/file_spec.rb
  32. +1 −1 spec/screw_unit/resources/spec_dir_spec.rb
  33. +1 −1 spec/screw_unit/resources/spec_suite_spec.rb
  34. +0 −7 vendor/sprockets/.gitignore
  35. +0 −22 vendor/sprockets/CHANGELOG
  36. +0 −20 vendor/sprockets/LICENSE
  37. +0 −230 vendor/sprockets/README.markdown
  38. +0 −19 vendor/sprockets/Rakefile
  39. +0 −54 vendor/sprockets/bin/sprocketize
  40. +0 −127 vendor/sprockets/ext/nph-sprockets.cgi
  41. +0 −42 vendor/sprockets/lib/sprockets.rb
  42. +0 −36 vendor/sprockets/lib/sprockets/concatenation.rb
  43. +0 −52 vendor/sprockets/lib/sprockets/environment.rb
  44. +0 −5 vendor/sprockets/lib/sprockets/error.rb
  45. +0 −37 vendor/sprockets/lib/sprockets/pathname.rb
  46. +0 −94 vendor/sprockets/lib/sprockets/preprocessor.rb
  47. +0 −107 vendor/sprockets/lib/sprockets/secretary.rb
  48. +0 −54 vendor/sprockets/lib/sprockets/source_file.rb
  49. +0 −82 vendor/sprockets/lib/sprockets/source_line.rb
  50. +0 −9 vendor/sprockets/lib/sprockets/version.rb
  51. +0 −15 vendor/sprockets/sprockets.gemspec
  52. +0 −1 vendor/sprockets/test/fixtures/assets/images/script_with_assets/one.png
  53. +0 −1 vendor/sprockets/test/fixtures/assets/images/script_with_assets/two.png
  54. +0 −1 vendor/sprockets/test/fixtures/assets/stylesheets/script_with_assets.css
  55. +0 −1 vendor/sprockets/test/fixtures/constants.yml
  56. +0 −1 vendor/sprockets/test/fixtures/dependency_ordered_source_files.js
  57. +0 −8 ...res/double_slash_comments_that_are_not_requires_should_be_ignored_when_strip_comments_is_false.js
  58. +0 −2 ...rockets/test/fixtures/double_slash_comments_that_are_not_requires_should_be_removed_by_default.js
  59. +0 −4 vendor/sprockets/test/fixtures/multiline_comments_should_be_removed_by_default.js
  60. +0 −5 .../sprockets/test/fixtures/requiring_a_file_after_it_has_already_been_required_should_do_nothing.js
  61. +0 −1 vendor/sprockets/test/fixtures/requiring_a_file_that_does_not_exist_should_raise_an_error.js
  62. +0 −3 ...est/fixtures/requiring_a_single_file_should_replace_the_require_comment_with_the_file_contents.js
  63. +0 −1 vendor/sprockets/test/fixtures/requiring_the_current_file_should_do_nothing.js
  64. +0 −3 vendor/sprockets/test/fixtures/src/constants.yml
  65. +0 −1 vendor/sprockets/test/fixtures/src/foo.js
  66. +0 −4 vendor/sprockets/test/fixtures/src/foo/bar.js
  67. +0 −1 vendor/sprockets/test/fixtures/src/foo/foo.js
  68. +0 −1 vendor/sprockets/test/fixtures/src/interdependent_sources/1.js
  69. +0 −2 vendor/sprockets/test/fixtures/src/interdependent_sources/2.js
  70. +0 −1 vendor/sprockets/test/fixtures/src/interdependent_sources/3.js
  71. +0 −3 vendor/sprockets/test/fixtures/src/script_with_assets.js
  72. +0 −13 vendor/sprockets/test/fixtures/src/script_with_comments.js
  73. +0 −28 vendor/sprockets/test/test_concatenation.rb
  74. +0 −64 vendor/sprockets/test/test_environment.rb
  75. +0 −55 vendor/sprockets/test/test_helper.rb
  76. +0 −43 vendor/sprockets/test/test_pathname.rb
  77. +0 −123 vendor/sprockets/test/test_preprocessor.rb
  78. +0 −93 vendor/sprockets/test/test_secretary.rb
  79. +0 −34 vendor/sprockets/test/test_source_file.rb
  80. +0 −89 vendor/sprockets/test/test_source_line.rb
View
@@ -1,8 +0,0 @@
----
-vendor/sprockets:
- squashed: true
- url: git://github.com/nathansobo/sprockets.git
- branch: master
- type: git
- revision: 6a4c881e40aa25071f1d064b4ddf295ed8851d3c
- remote: braid/vendor/sprockets
View
@@ -1,4 +1,4 @@
-ScrewUnit.configure do
+ ScrewUnit.configure do
port 8181
add_js_location "/under_test", "client/lib"
add_js_location "/specs", "client/spec"
View
@@ -1,6 +0,0 @@
-=== 1.0.0 / 2009-02-15
-
-* 1 major enhancement
-
- * Birthday!
-
View
@@ -1,63 +0,0 @@
-.gitignore
-History.txt
-Manifest.txt
-README.markdown
-README.txt
-Rakefile
-bin/screw
-example/.screwrc
-example/models/cat.js
-example/models/man.js
-example/spec/matchers/have.js
-example/spec/models/cat_spec.js
-example/spec/models/man_spec.js
-example/spec/spec_helper.js
-example/spec/suite.html
-javascript/lib/core.js
-javascript/lib/disco.js
-javascript/lib/foundation.js
-javascript/lib/interface.js
-javascript/lib/jquery-1.2.6.js
-javascript/lib/jquery.print.js
-javascript/lib/json.js
-javascript/lib/matchers.js
-javascript/lib/prefs.js
-javascript/lib/require.js
-javascript/lib/screw.css
-javascript/spec/core_spec.js
-javascript/spec/integration_spec.js
-javascript/spec/interface_spec.js
-javascript/spec/matchers_spec.js
-javascript/spec/print_spec.js
-javascript/spec/suite.html
-lib/.DS_Store
-lib/screw_unit.rb
-lib/screw_unit/configuration.rb
-lib/screw_unit/dispatcher.rb
-lib/screw_unit/resources.rb
-lib/screw_unit/resources/dir.rb
-lib/screw_unit/resources/file.rb
-lib/screw_unit/resources/file_not_found.rb
-lib/screw_unit/resources/root.rb
-lib/screw_unit/resources/spec_dir.rb
-lib/screw_unit/resources/spec_suite.rb
-lib/screw_unit/server.rb
-spec/screw_unit/configuration_spec.rb
-spec/screw_unit/dispatcher_spec.rb
-spec/screw_unit/resources/dir_spec.rb
-spec/screw_unit/resources/file_spec.rb
-spec/screw_unit/resources/file_system_fixtures/code_under_test/code_under_test.js
-spec/screw_unit/resources/file_system_fixtures/foo.css
-spec/screw_unit/resources/file_system_fixtures/foo.gif
-spec/screw_unit/resources/file_system_fixtures/foo.jpeg
-spec/screw_unit/resources/file_system_fixtures/foo.jpg
-spec/screw_unit/resources/file_system_fixtures/foo.js
-spec/screw_unit/resources/file_system_fixtures/foo.png
-spec/screw_unit/resources/file_system_fixtures/specs/foo_spec.js
-spec/screw_unit/resources/file_system_fixtures/specs/subsuite/bar_spec.js
-spec/screw_unit/resources/root_spec.rb
-spec/screw_unit/resources/spec_dir_spec.rb
-spec/screw_unit/resources/spec_suite_spec.rb
-spec/screw_unit/server_spec.rb
-spec/screw_unit_spec_helper.rb
-spec/screw_unit_spec_suite.rb
No changes.
View
@@ -1,5 +1,5 @@
ScrewUnit.configure do
port 8082
- code_under_test_path "models"
- specs_path "spec"
- end
+ add_js_location "/under_test", "lib"
+ add_js_location "/specs", "spec"
+ end
@@ -0,0 +1,2 @@
+//= require "models/cat"
+//= require "models/man"
File renamed without changes.
@@ -8,10 +8,10 @@ function Man(options) {
return luck;
};
this.render = function() {
- return $('<ul class="man">')
+ return Screw.$('<ul class="man">')
.append('<li class="hair">')
.click(function() {
- $(this).children('.hair').remove();
+ Screw.$(this).children('.hair').remove();
});
};
-}
+}
@@ -1,4 +1,4 @@
-require("/specs/spec_helper")
+//= require "../spec_helper"
Screw.Unit(function(c) { with(c) {
describe('Cat', function() {
@@ -30,4 +30,4 @@ Screw.Unit(function(c) { with(c) {
});
});
});
-}});
+}});
@@ -1,4 +1,4 @@
-require("/specs/spec_helper");
+//= require "../spec_helper"
Screw.Unit(function(c) { with(c) {
describe('Man', function() {
@@ -23,14 +23,14 @@ Screw.Unit(function(c) { with(c) {
describe('@click', function() {
before(function() {
- $('#test_content').append(man.render());
+ Screw.$('#test_content').append(man.render());
});
it("removes the man's hair", function() {
- expect($('.man .hair')).to_not(be_empty);
- $('.man').click();
- expect($('.man .hair')).to(be_empty);
+ expect(Screw.$('.man .hair')).to_not(be_empty);
+ Screw.$('.man').click();
+ expect(Screw.$('.man .hair')).to(be_empty);
});
});
});
-}});
+}});
@@ -1,8 +1,7 @@
-require("/cat");
-require("/man");
+//= require <example>;
Screw.Unit(function(c) { with(c) {
before(function() {
- $('dom_test').empty();
+ Screw.$('dom_test').empty(); // Screw comes with its own version of jQuery, located Screw.$ to keep out of your version's way if you have one
});
-}});
+}});
@@ -11,8 +11,8 @@
<script src="spec_helper.js"></script>
<script src="matchers/have.js"></script>
- <script src="../models/cat.js"></script>
- <script src="../models/man.js"></script>
+ <script src="../lib/models/cat.js"></script>
+ <script src="../lib/models/man.js"></script>
<script src="models/cat_spec.js"></script>
<script src="models/man_spec.js"></script>
@@ -22,4 +22,4 @@
<body>
<div id="dom_test" style="position: absolute; left: -9999"></div>
</body>
-</html>
+</html>
Oops, something went wrong. Retry.

0 comments on commit efbf242

Please sign in to comment.