evergreen 1.1.0 → 1.1.2

data/lib/jasmine/src/html/ReporterView.js

@@ -81,14 +81,14 @@ jasmine.HtmlReporter.ReporterView = function(dom) {
 
     // currently running UI
     if (isUndefined(this.runningAlert)) {
-      this.runningAlert = this.createDom('a', {href: "?", className: "runningAlert bar"});
+      this.runningAlert = this.createDom('a', { href: jasmine.HtmlReporter.sectionLink(), className: "runningAlert bar" });
       dom.alert.appendChild(this.runningAlert);
     }
     this.runningAlert.innerHTML = "Running " + this.completeSpecCount + " of " + specPluralizedFor(this.totalSpecCount);
 
     // skipped specs UI
     if (isUndefined(this.skippedAlert)) {
-      this.skippedAlert = this.createDom('a', {href: "?", className: "skippedAlert bar"});
+      this.skippedAlert = this.createDom('a', { href: jasmine.HtmlReporter.sectionLink(), className: "skippedAlert bar" });
     }
 
     this.skippedAlert.innerHTML = "Skipping " + this.skippedCount + " of " + specPluralizedFor(this.totalSpecCount) + " - run all";
@@ -99,7 +99,7 @@ jasmine.HtmlReporter.ReporterView = function(dom) {
 
     // passing specs UI
     if (isUndefined(this.passedAlert)) {
-      this.passedAlert = this.createDom('span', {href: "?", className: "passingAlert bar"});
+      this.passedAlert = this.createDom('span', { href: jasmine.HtmlReporter.sectionLink(), className: "passingAlert bar" });
     }
     this.passedAlert.innerHTML = "Passing " + specPluralizedFor(this.passedCount);
 

data/lib/jasmine/src/html/SpecView.js

@@ -7,11 +7,11 @@ jasmine.HtmlReporter.SpecView = function(spec, dom, views) {
   this.dom.symbolSummary.appendChild(this.symbol);
 
   this.summary = this.createDom('div', { className: 'specSummary' },
-      this.createDom('a', {
-        className: 'description',
-        href: '?spec=' + encodeURIComponent(this.spec.getFullName()),
-        title: this.spec.getFullName()
-      }, this.spec.description)
+    this.createDom('a', {
+      className: 'description',
+      href: jasmine.HtmlReporter.sectionLink(this.spec.getFullName()),
+      title: this.spec.getFullName()
+    }, this.spec.description)
   );
 
   this.detail = this.createDom('div', { className: 'specDetail' },

data/lib/jasmine/src/html/SuiteView.js

@@ -4,7 +4,7 @@ jasmine.HtmlReporter.SuiteView = function(suite, dom, views) {
   this.views = views;
 
   this.element = this.createDom('div', { className: 'suite' },
-      this.createDom('a', { className: 'description', href: '?spec=' + encodeURIComponent(this.suite.getFullName()) }, this.suite.description)
+    this.createDom('a', { className: 'description', href: jasmine.HtmlReporter.sectionLink(this.suite.getFullName()) }, this.suite.description)
   );
 
   this.appendToSummary(this.suite, this.element);

data/lib/jasmine/src/html/_HTMLReporter.scss

@@ -136,167 +136,174 @@ body {
       }
     }
   }
-  
+
+  .exceptions {
+    color: #fff;
+    float: right;
+    margin-top: 5px;
+    margin-right: 5px;
+  }
+
   //--- Alert ---//
-  
+
   .bar {
     line-height: $line-height * 2;
     font-size: $large-font-size;
-    
+
     display: block;
     color: #eee;
   }
-  
+
   .runningAlert {
     background-color: $light-text-color;
   }
-  
+
   .skippedAlert {
     background-color: $feint-text-color;
-  
+
     &:first-child {
       background-color: $text-color;
     }
-    
+
     &:hover {
       text-decoration: none;
       color: white;
       text-decoration: underline;
     }
   }
-  
+
   .passingAlert {
     background-color: $light-passing-color;
-    
+
     &:first-child {
       background-color: $passing-color;
     }
   }
-  
+
   .failingAlert {
     background-color: $light-failing-color;
-    
+
     &:first-child {
       background-color: $failing-color
     }
   }
 
   //--- Results ---//
-  
+
   .results {
     margin-top: $line-height;
   }
 
   //--- Results menu ---//
-  
+
   #details {
     display: none;
   }
-  
+
   .resultsMenu,
   .resultsMenu a {
     background-color: #fff;
     color: $text-color;
   }
-  
+
   &.showDetails {
-    
+
     .summaryMenuItem {
       font-weight: normal;
       text-decoration: inherit;
-      
+
       &:hover {
         text-decoration: underline;
       }
     }
-    
+
     .detailsMenuItem {
       font-weight: bold;
-      text-decoration: underline;    
+      text-decoration: underline;
     }
-  
+
     .summary {
       display: none;
     }
-    
+
     #details {
       display: block;
     }
   }
-  
-  .summaryMenuItem {  
+
+  .summaryMenuItem {
     font-weight: bold;
     text-decoration: underline;
   }
-  
+
   //--- Results summary ---//
-  
+
   .summary {
     margin-top: $margin-unit;
-    
+
     .suite .suite, .specSummary {
       margin-left: $margin-unit;
     }
-    
+
     .specSummary {
       &.passed a {
-        color: $passing-color;  
+        color: $passing-color;
       }
       &.failed a {
         color: $failing-color;
       }
     }
   }
-  
+
   .description+.suite {
     margin-top: 0;
   }
-  
+
   .suite {
     margin-top: $margin-unit;
-    
+
     a {
       color: $text-color;
     }
   }
-  
+
   //--- Results details ---//
-  
+
   #details {
     .specDetail {
       margin-bottom: $line-height * 2;
-      
+
       .description {
         //line-height: $line-height * 2;
         display: block;
-  
+
         color: white;
         background-color: $failing-color;
-        
+
         //font-size: $large-font-size;
       }
     }
   }
-  
+
   .resultMessage {
     padding-top: $line-height;
-    
+
     color: $text-color;
   }
-  
+
   .resultMessage span.result {
     display: block;
   }
-  
+
   .stackTrace {
     margin: 5px 0 0 0;
     max-height: $line-height * 16;
     overflow: auto;
     line-height: 18px;
-    
+
     color: $light-text-color;
     border: 1px solid #ddd;
     background: white;
     white-space: pre;
   }
-}
+}

data/lib/jasmine/src/html/jasmine.css

@@ -19,6 +19,7 @@ body { background-color: #eeeeee; padding: 0; margin: 5px; overflow-y: scroll; }
 #HTMLReporter .symbolSummary li.skipped:before { color: #bababa; content: "\02022"; }
 #HTMLReporter .symbolSummary li.pending { line-height: 11px; }
 #HTMLReporter .symbolSummary li.pending:before { color: #aaaaaa; content: "-"; }
+#HTMLReporter .exceptions { color: #fff; float: right; margin-top: 5px; margin-right: 5px; }
 #HTMLReporter .bar { line-height: 28px; font-size: 14px; display: block; color: #eee; }
 #HTMLReporter .runningAlert { background-color: #666666; }
 #HTMLReporter .skippedAlert { background-color: #aaaaaa; }

data/lib/jasmine/src/version.js

@@ -1,7 +1,7 @@
 
 jasmine.version_= {
   "major": 1,
-  "minor": 2,
-  "build": 0,
-  "revision": 1337006083
+  "minor": 3,
+  "build": 1,
+  "revision": 1354556913
 };

data/lib/jasmine/src/version.json

@@ -1,5 +1,5 @@
 {
   "major": 1,
-  "minor": 2,
-  "build": 0
+  "minor": 3,
+  "build": 1
 }

data/lib/jasmine/tasks/jasmine_dev/build_github_pages.rb

@@ -8,24 +8,21 @@ class JasmineDev < Thor
 
     return unless pages_submodule_installed?
 
-    pages_output = File.join(pages_dir, 'pages_output')
-    FileUtils.rm_r(pages_output) if File.exist?(pages_output)
+    project_lib_dir = File.join(JasmineDev.project_root, 'lib', 'jasmine-core')
 
-    inside File.join('pages', 'pages_source') do
-      run_with_output "frank export #{pages_output}", :capture => true
-    end
+    pages_lib_dir = File.join(pages_dir, 'lib')
+    FileUtils.rm_r(pages_lib_dir) if File.exist?(pages_lib_dir)
 
-    pages_files = Dir.chdir(pages_output) { Dir.glob('*') }
+    ['jasmine.js', 'jasmine-html.js', 'jasmine.css'].each do |file|
+      copy_file File.join(project_lib_dir, file), File.join(pages_lib_dir, file)
+    end
 
-    pages_files.each do |file|
-      source_path = File.join(pages_output, file)
-      destination_path = File.join(pages_dir, file)
+    inside File.join(JasmineDev.project_root, 'pages', 'src') do
+      run_with_output "bundle exec rocco -l js introduction.js -t layout.mustache -o #{pages_dir}"
+    end
 
-      if File.directory?(source_path)
-        directory source_path, destination_path
-      else
-        copy_file source_path, destination_path
-      end
+    inside pages_dir do
+      copy_file File.join(pages_dir,'introduction.html'), File.join(pages_dir,'index.html')
     end
   end
 end

data/lib/jasmine/tasks/jasmine_dev/build_standalone_distribution.rb

@@ -28,7 +28,8 @@ class JasmineDev < Thor
       run_with_output "zip -rq ../jasmine-standalone-#{version_string}.zip ."
 
       say "Copying Zip file to downloads directory", :yellow
-      run "cp ../jasmine-standalone-#{version_string}.zip #{download_dir}"
+      run "mkdir -p #{download_dir}"
+      run "cp ../jasmine-standalone-#{version_string}.zip #{download_dir}/"
     end
 
   end
@@ -46,4 +47,4 @@ class JasmineDev < Thor
       File.join('lib', "jasmine-#{version_string}")
     end
   end
-end
+end

data/lib/jasmine/tasks/jasmine_dev/build_standalone_runner.rb

@@ -49,11 +49,11 @@ class JasmineDev < Thor
     end
 
     def example_source_tags
-      script_tags_for ['spec/SpecHelper.js', 'spec/PlayerSpec.js']
+      script_tags_for ['src/Player.js', 'src/Song.js']
     end
 
     def example_spec_tags
-      script_tags_for ['src/Player.js', 'src/Song.js']
+      script_tags_for ['spec/SpecHelper.js', 'spec/PlayerSpec.js']
     end
   end
-end
+end

data/spec/runner_spec.rb

@@ -10,8 +10,6 @@ describe Evergreen::Runner do
 
     describe 'the buffer' do
       subject { buffer.rewind; buffer.read }
-
-      it { should include('.F..') }
       it { should include("Expected 'bar' to equal 'noooooo'") }
       it { should include("18 examples, 3 failures") }
     end

data/spec/suite_spec.rb

@@ -3,12 +3,15 @@ require 'spec_helper'
 describe Evergreen::Suite do
   subject { Evergreen::Suite.new }
 
-  its(:root) { should == File.expand_path('suite1', File.dirname(__FILE__)) }
-
   describe '#get_spec' do
     subject { Evergreen::Suite.new.get_spec('testing_spec.js') }
-    its(:name) { should == 'testing_spec.js' }
-    its(:root) { should == File.expand_path('suite1', File.dirname(__FILE__)) }
+    it 'has the correct name' do
+      expect(subject.name).to eq 'testing_spec.js'
+    end
+
+    it 'should have the correct root' do
+      expect(subject.root).to eq File.expand_path('suite1', File.dirname(__FILE__))
+    end
   end
 
   describe '#specs' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: evergreen
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-27 00:00:00.000000000 Z
+date: 2014-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -261,6 +261,8 @@ files:
 - lib/jasmine/spec/html/MatchersHtmlSpec.js
 - lib/jasmine/spec/html/PrettyPrintHtmlSpec.js
 - lib/jasmine/spec/html/TrivialReporterSpec.js
+- lib/jasmine/spec/jasmine.yml
+- lib/jasmine/spec/jasmine_self_test_spec.rb
 - lib/jasmine/spec/node_suite.js
 - lib/jasmine/spec/runner.html
 - lib/jasmine/spec/spec_helper.rb
@@ -384,4 +386,3 @@ signing_key:
 specification_version: 3
 summary: Run Jasmine JavaScript unit tests, integrate them into Ruby applications.
 test_files: []
-has_rdoc: