Skip to content

Commit 481ef1a

Browse files
author
Theo Cushion
committed
Feature: Updated to jasmine-sauce gem
1 parent f882e71 commit 481ef1a

File tree

8 files changed

+124
-247
lines changed

8 files changed

+124
-247
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
sauce_connect.log

‎Gemfile

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,4 @@ gem 'rake'
44
gem 'mongrel'
55
gem 'sprockets'
66
gem 'jasmine'
7-
8-
gem 'saucelabs-adapter'
7+
gem 'jasmine-sauce'

‎Gemfile.lock

+42-16
Original file line numberDiff line numberDiff line change
@@ -2,49 +2,75 @@ GEM
22
remote: http://rubygems.org/
33
specs:
44
cgi_multipart_eof_fix (2.5.0)
5-
daemons (1.1.0)
5+
childprocess (0.1.8)
6+
ffi (~> 1.0.6)
7+
cmdparse (2.0.3)
8+
daemons (1.1.2)
9+
diff-lcs (1.1.2)
610
fastthread (1.0.7)
11+
ffi (1.0.7)
12+
rake (>= 0.8.7)
713
gem_plugin (0.2.3)
8-
jasmine (1.0.0)
14+
highline (1.6.1)
15+
jasmine (1.0.1.1)
916
json_pure (>= 1.4.3)
1017
rack (>= 1.0.0)
1118
rake (>= 0.8.7)
1219
rspec (>= 1.1.5)
1320
selenium-client (>= 1.2.17)
1421
selenium-rc (>= 2.1.0)
15-
json_pure (1.4.6)
16-
lsof (0.3.0)
22+
jasmine-sauce (0.2.2)
23+
jasmine (~> 1.0.1.1)
24+
sauce (>= 0.19.1)
25+
json (1.5.1)
26+
json_pure (1.5.1)
1727
mime-types (1.16)
1828
mongrel (1.1.5)
1929
cgi_multipart_eof_fix (>= 2.4)
2030
daemons (>= 1.0.3)
2131
fastthread (>= 1.0.1)
2232
gem_plugin (>= 0.2.3)
23-
net-ssh (2.0.23)
33+
net-ssh (2.1.4)
2434
net-ssh-gateway (1.0.1)
2535
net-ssh (>= 1.99.1)
26-
rack (1.2.1)
36+
rack (1.2.2)
2737
rake (0.8.7)
28-
rest-client (1.5.1)
38+
rest-client (1.6.1)
2939
mime-types (>= 1.16)
30-
rspec (1.3.0)
31-
saucelabs-adapter (0.8.8)
32-
lsof (>= 0.3.0)
33-
net-ssh (>= 2.0.12)
34-
net-ssh-gateway (>= 1.0.1)
35-
rest-client (>= 1.2.0)
36-
selenium-client (>= 1.2.17)
40+
rspec (2.5.0)
41+
rspec-core (~> 2.5.0)
42+
rspec-expectations (~> 2.5.0)
43+
rspec-mocks (~> 2.5.0)
44+
rspec-core (2.5.1)
45+
rspec-expectations (2.5.0)
46+
diff-lcs (~> 1.1.2)
47+
rspec-mocks (2.5.0)
48+
rubyzip (0.9.4)
49+
sauce (1.0.0)
50+
childprocess (>= 0.1.6)
51+
cmdparse (>= 2.0.2)
52+
highline (>= 1.5.0)
53+
json (>= 1.2.0)
54+
net-ssh
55+
net-ssh-gateway
56+
rest-client
57+
selenium-webdriver (>= 0.1.4)
3758
selenium-client (1.2.18)
38-
selenium-rc (2.2.4)
59+
selenium-rc (2.3.2)
3960
selenium-client (>= 1.2.18)
61+
selenium-webdriver (0.1.4)
62+
childprocess (>= 0.1.7)
63+
ffi (>= 1.0.7)
64+
json_pure
65+
rubyzip
4066
sprockets (1.0.2)
4167

4268
PLATFORMS
4369
ruby
4470

4571
DEPENDENCIES
4672
jasmine
73+
jasmine-sauce
4774
mongrel
4875
rake
49-
saucelabs-adapter
5076
sprockets

‎Rakefile

+2-36
Original file line numberDiff line numberDiff line change
@@ -2,42 +2,8 @@ require 'rubygems'
22
require 'bundler'
33
Bundler.require
44

5-
namespace :jasmine do
6-
require 'jasmine'
7-
8-
desc "Run continuous integration tests"
9-
require "spec"
10-
require 'spec/rake/spectask'
11-
Spec::Rake::SpecTask.new(:saucelabs) do |t|
12-
t.spec_opts = ["--color", "--format", "progress"]
13-
t.verbose = true
14-
t.spec_files = ['spec/javascripts/support/jasmine_runner.rb']
15-
end
16-
17-
YAML.load_file( File.join(File.dirname(__FILE__), 'config', 'selenium.yml') ).each_key do |browser|
18-
desc browser
19-
task browser do
20-
ENV['JASMINE_BROWSER'] = browser
21-
Rake::Task["jasmine:saucelabs"].reenable
22-
Rake::Task["jasmine:saucelabs"].invoke
23-
end
24-
end
25-
26-
task :ci => %w(jasmine:firefox_3_0 jasmine:firefox_3_6 jasmine:googlechrome jasmine:safari_4 jasmine:ie_6 jasmine:ie_7 jasmine:ie_8)
27-
28-
task :server do
29-
port = ENV['PORT'] || 8888
30-
require 'spec/javascripts/support/jasmine_config'
31-
32-
puts "your tests are here:"
33-
puts " http://localhost:#{port}/run.html"
34-
35-
Jasmine::Config.new.start_server port
36-
end
37-
end
38-
39-
desc "Run specs via server"
40-
task :jasmine => ['jasmine:server']
5+
load 'jasmine/tasks/jasmine.rake'
6+
load 'sauce/jasmine/jasmine-sauce.rake'
417

428
namespace :js do
439
task :combine do

‎config/ondemand.yml

+54
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
# http://saucelabs.com/docs/sauce-ondemand/browsers
2+
# Default firefox
3+
os: "Windows 2003"
4+
browser: "firefox"
5+
version: "3.6."
6+
browsers:
7+
- - "Windows 2003"
8+
- "firefox"
9+
- "2.0."
10+
- - "Windows 2003"
11+
- "firefox"
12+
- "3.0."
13+
# - - "Windows 2003"
14+
# - "firefox"
15+
# - "3.5."
16+
- - "Windows 2003"
17+
- "firefox"
18+
- "3.6."
19+
- - "Windows 2008"
20+
- "firefox"
21+
- "4."
22+
- - "Windows 2003"
23+
- "googlechrome"
24+
- ""
25+
- - "Windows 2003"
26+
- "iexplore"
27+
- "6."
28+
- - "Windows 2003"
29+
- "iexplore"
30+
- "7."
31+
- - "Windows 2003"
32+
- "iexplore"
33+
- "8."
34+
# - - "Windows 2008"
35+
# - "iexplore"
36+
# - "9."
37+
# - - "Windows 2003"
38+
# - "opera"
39+
# - "9."
40+
- - "Windows 2003"
41+
- "opera"
42+
- "10."
43+
- - "Windows 2003"
44+
- "opera"
45+
- "11."
46+
- - "Windows 2003"
47+
- "safari"
48+
- "3."
49+
- - "Windows 2003"
50+
- "safari"
51+
- "4."
52+
- - "Windows 2003"
53+
- "safariproxy"
54+
- "5."

‎config/selenium.yml

-79
This file was deleted.

‎spec/javascripts/support/jasmine_config.rb

-105
This file was deleted.

0 commit comments

Comments
 (0)