pivotal-screw-unit-server 0.5.10 → 0.5.11

data/CHANGES

@@ -1,3 +1,6 @@
+0.5.11
+- Added ScrewUnit::Representations::Spec.project_js_files, .project_css_files, and .jquery_js_file.
+
 0.5.10
 - Updated to erector 0.6.7, which fixes a bug related to including modules into Representations.
 

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 5
-:patch: 10
+:patch: 11

data/lib/screw_unit/representations/spec.html.rb

@@ -1,6 +1,13 @@
 module ScrewUnit
   module Representations
     class Spec < JsTestCore::Representations::Spec
+      class << self
+        def jquery_js_file
+          @jquery_js_file ||= "/core/jquery-1.3.2.js"
+        end
+        attr_writer :jquery_js_file
+      end
+
       needs :spec_files
       def title_text
         "Screw Unit suite"
@@ -100,14 +107,8 @@ module ScrewUnit
         script :src => "/core/screw.behaviors.js"
       end
 
-      def project_js_files
-      end
-
-      def project_css_files
-      end
-
       def jquery_js_file
-        "/core/jquery-1.3.2.js"
+        self.class.jquery_js_file
       end
 
       def body_content

data/spec/unit/spec_file_spec.rb

@@ -6,28 +6,64 @@ module JsTestCore
       describe SpecFile do
         describe "File" do
           describe "GET /specs/failing_spec" do
-            attr_reader :html, :doc
-            before do
-              response = get(SpecFile.path("/failing_spec"))
-              response.should be_http(
-                200,
-                {},
-                ""
-              )
+            attr_reader :doc
 
-              @doc = Nokogiri::HTML(response.body)
-            end
+            context "when using the default .jquery_js_file" do
+              before do
+                ScrewUnit::Representations::Spec.project_js_files += ["/javascripts/test_file_1.js", "/javascripts/test_file_2.js"]
+                ScrewUnit::Representations::Spec.project_css_files += ["/stylesheets/test_file_1.css", "/stylesheets/test_file_2.css"]
 
-            it "returns script tags for the test javascript file" do
-              doc.at("script[@src='/specs/failing_spec.js']").should_not be_nil
+                response = get(SpecFile.path("/failing_spec"))
+                response.should be_http( 200, {}, "" )
+
+                @doc = Nokogiri::HTML(response.body)
+              end
+
+              after do
+                ScrewUnit::Representations::Spec.project_js_files.clear
+                ScrewUnit::Representations::Spec.project_css_files.clear
+              end
+
+              it "returns script tags for the test javascript file" do
+                doc.at("script[@src='/specs/failing_spec.js']").should_not be_nil
+              end
+
+              it "renders the screw unit template" do
+                doc.at("link[@href='/core/screw.css']").should_not be_nil
+                doc.at("script[@src='/core/screw.builder.js']").should_not be_nil
+                doc.at("script[@src='/core/screw.events.js']").should_not be_nil
+                doc.at("script[@src='/core/screw.behaviors.js']").should_not be_nil
+                doc.at("body/#screw_unit_content").should_not be_nil
+              end
+
+              it "renders project js files" do
+                doc.at("script[@src='/javascripts/test_file_1.js']").should_not be_nil
+                doc.at("script[@src='/javascripts/test_file_2.js']").should_not be_nil
+              end
+
+              it "renders project css files" do
+                doc.at("link[@href='/stylesheets/test_file_1.css']").should_not be_nil
+                doc.at("link[@href='/stylesheets/test_file_2.css']").should_not be_nil
+              end
             end
 
-            it "returns the screw unit template" do
-              doc.at("link[@href='/core/screw.css']").should_not be_nil
-              doc.at("script[@src='/core/screw.builder.js']").should_not be_nil
-              doc.at("script[@src='/core/screw.events.js']").should_not be_nil
-              doc.at("script[@src='/core/screw.behaviors.js']").should_not be_nil
-              doc.at("body/#screw_unit_content").should_not be_nil
+            context "when using a custom .jquery_js_file" do
+              attr_reader :default_jquery_js_file
+              before do
+                @default_jquery_js_file = ScrewUnit::Representations::Spec.jquery_js_file
+                ScrewUnit::Representations::Spec.jquery_js_file = "/javascripts/jquery-6.6.6.js"
+                default_jquery_js_file.should_not == ScrewUnit::Representations::Spec.jquery_js_file
+
+                response = get(SpecFile.path("/failing_spec"))
+                response.should be_http( 200, {}, "" )
+
+                @doc = Nokogiri::HTML(response.body)
+              end
+
+              it "renders the custom jquery file" do
+                doc.at("script[@src='/javascripts/jquery-6.6.6.js']").should_not be_nil
+                doc.at("script[@src='#{default_jquery_js_file}']").should be_nil
+              end
             end
           end
         end

data/vendor/js-test-core/CHANGES

@@ -1,3 +1,4 @@
+- Added JsTestCore::Representations::Spec.project_js_files and .project_css_files
 - Updated to erector 0.6.7, which fixes a bug related to including modules into Representations.
 - Allow test suite to clear all cookies
 - No longer using the /implementanions directory. Replace all cases of /implementations with /javascripts.

data/vendor/js-test-core/lib/js_test_core/representations/spec.html.rb

@@ -1,6 +1,18 @@
 module JsTestCore
   module Representations
     class Spec < Page
+      class << self
+        def project_js_files
+          @project_js_files ||= []
+        end
+        attr_writer :project_js_files
+
+        def project_css_files
+          @project_css_files ||= []
+        end
+        attr_writer :project_css_files
+      end
+
       needs :spec_files, :session_id
       protected
       def title_text
@@ -8,6 +20,8 @@ module JsTestCore
       end
 
       def head_content
+        project_js_files
+        project_css_files
         spec_script_elements
       end
 
@@ -21,6 +35,18 @@ module JsTestCore
       def script_to_set_window_session_id
         script "window._session_id = '#{session_id}';", :type => "text/javascript"
       end
+
+      def project_js_files
+        self.class.project_js_files.each do |file|
+          script :src => file, :type => "text/javascript"
+        end
+      end
+
+      def project_css_files
+        self.class.project_css_files.each do |file|
+          link :href => file, :type => "text/css", :media => "screen", :rel => "stylesheet"
+        end
+      end
       
       def body_content
       end

data/vendor/js-test-core/spec/unit/js_test_core/resources/spec_file_spec.rb

@@ -3,6 +3,34 @@ require File.expand_path("#{File.dirname(__FILE__)}/../../unit_spec_helper")
 module JsTestCore
   module Resources
     describe SpecFile do
+      describe "Configuration" do
+        attr_reader :doc
+        before do
+          JsTestCore::Representations::Spec.project_js_files += ["/javascripts/test_file_1.js", "/javascripts/test_file_2.js"]
+          JsTestCore::Representations::Spec.project_css_files += ["/stylesheets/test_file_1.css", "/stylesheets/test_file_2.css"]
+
+          response = get(SpecFile.path("/failing_spec"))
+          response.should be_http( 200, {}, "" )
+
+          @doc = Nokogiri::HTML(response.body)
+        end
+
+        after do
+          JsTestCore::Representations::Spec.project_js_files.clear
+          JsTestCore::Representations::Spec.project_css_files.clear
+        end
+
+        it "renders project js files" do
+          doc.at("script[@src='/javascripts/test_file_1.js']").should_not be_nil
+          doc.at("script[@src='/javascripts/test_file_2.js']").should_not be_nil
+        end
+
+        it "renders project css files" do
+          doc.at("link[@href='/stylesheets/test_file_1.css']").should_not be_nil
+          doc.at("link[@href='/stylesheets/test_file_2.css']").should_not be_nil
+        end
+      end
+
       describe "Files" do
         describe "GET /specs/failing_spec" do
           it "renders a suite only for failing_spec.js as text/html" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pivotal-screw-unit-server
 version: !ruby/object:Gem::Version 
-  version: 0.5.10
+  version: 0.5.11
 platform: ruby
 authors: 
 - Pivotal Labs