mediawiki-selenium 0.1.18 → 0.1.19

Sign up to get free protection for your applications and to get access to all the features.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. data/docs/{UploadWizard-commons.wikimedia.org.md → UploadWizard.md} +6 -3
  3. data/docs/template.md +1 -1
  4. data/lib/mediawiki/selenium/env.rb +38 -2
  5. data/lib/mediawiki/selenium/hooks.rb +0 -3
  6. data/lib/mediawiki/selenium/sauce.rb +8 -1
  7. data/lib/mediawiki/selenium/version.rb +1 -1
  8. data/mediawiki-selenium.gemspec +8 -8
  9. metadata +20 -20
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 0dc27f9a13e610eee552081ed4a9ce616a9cc3c6
4
- data.tar.gz: 2be999b4513e72a920e90e68baa367b403a03af0
3
+ metadata.gz: 9342d9d9b1d2eb40b5047aaa815b0d8186ac53c7
4
+ data.tar.gz: e8e39e2ffd8f1f07770313680cb2152b796ebe10
5
5
  SHA512:
6
- metadata.gz: f3a3534ecc8bb67f87d3e4224badebdcbafef2d5f9ae5d59e8d5b35547f6517d187b4d5b4e45ef750e77e6fa439f92679c9fe7c6807e47c178086aa17bb92a08
7
- data.tar.gz: 4d5ca6ae66e38ad2da44a6954b4c96932adabc9628095b07d927a49a1368746320524843c194f0a2f1e083a11917d2f6c91800eeb5b12dc7683e90c5a2bd213c
6
+ metadata.gz: 3a10ec96f01df2066d8be9d26394209f207eb11ce2ba550ac6b72e5c1b58b4e15f49684e7bc0cc51da2822207c770c77284c87d5cff6978e3bee2bc9f91dd6c7
7
+ data.tar.gz: bcbe115542f045503002acb358fe9326b2644edbfc9da98eff7f32791aadd9c9a97552908d1e853cb8e683a9a69a9602a0f82768d202c795811c41134f66923c
data/docs/{UploadWizard-commons.wikimedia.org.md → UploadWizard.md} RENAMED
@@ -11,11 +11,12 @@
11
11
 
12
12
  --
13
13
 
14
- git fetch https://gerrit.wikimedia.org/r/mediawiki/extensions/UploadWizard refs/changes/61/109661/6 && git checkout FETCH_HEAD
14
+ set -e
15
15
  export MEDIAWIKI_PASSWORD_VARIABLE=MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG
16
16
  virtualenv --distribute DEV
17
17
  DEV/bin/pip install -rtests/api/requirements.txt
18
18
  DEV/bin/python tests/api/upload-wizard_tests.py --username "Selenium_user" --api_url "https://commons.wikimedia.org/w/api.php"
19
+ DEV/bin/python tests/api/upload-wizard_tests.py --gen_new_image --username "Selenium_user" --api_url "https://commons.wikimedia.org/w/api.php"
19
20
 
20
21
  --
21
22
 
@@ -33,19 +34,21 @@
33
34
  - OK
34
35
  - Jenkins > Job > Configure
35
36
  - Source Code Management > Git > Repositories > Repository URL: https://gerrit.wikimedia.org/r/mediawiki/extensions/UploadWizard
37
+ - Build Triggers > Build periodically > Schedule: H */6 * * * (every 6 hours)
36
38
  - Build Triggers > Poll SCM > Schedule > * * * * * (every minute)
37
39
  - Build > Add build step > Execute shell
38
40
 
39
41
  --
40
42
 
41
- git fetch https://gerrit.wikimedia.org/r/mediawiki/extensions/UploadWizard refs/changes/61/109661/6 && git checkout FETCH_HEAD
43
+ set -e
42
44
  export MEDIAWIKI_PASSWORD_VARIABLE=MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG
43
45
  virtualenv --distribute DEV
44
46
  DEV/bin/pip install -rtests/api/requirements.txt
45
47
  DEV/bin/python tests/api/upload-wizard_tests.py --username "Selenium_user" --api_url "http://commons.wikimedia.beta.wmflabs.org/w/api.php"
48
+ DEV/bin/python tests/api/upload-wizard_tests.py --gen_new_image --username "Selenium_user" --api_url "http://commons.wikimedia.beta.wmflabs.org/w/api.php"
46
49
 
47
50
  --
48
51
 
49
52
  - Add post-build action
50
53
  - E-mail Notification > Recipients > aarcos.wiki@gmail.com cmcmahon@wikimedia.org gtisza@wikimedia.org zfilipin@wikimedia.org
51
- - IRC Notification (notifies #wikimedia-qa by default)
54
+ - IRC Notification (notifies #wikimedia-qa by default)
data/docs/template.md CHANGED
@@ -235,7 +235,7 @@
235
235
  gem install bundler --no-ri --no-rdoc
236
236
  if [ -d "${FOLDER}" ]; then cd ${FOLDER}; fi
237
237
  bundle install
238
- bundle exec cucumber --backtrace --verbose --profile ci ${BUNDLE_EXEC_CUCUMBER}
238
+ bundle exec cucumber --backtrace --verbose --format pretty --format Cucumber::Formatter::Sauce --out reports/junit ${BUNDLE_EXEC_CUCUMBER} || (echo -e "\nJob has failed (exit code: $$?)."; false)
239
239
  </command>
240
240
  </hudson.tasks.Shell>
241
241
  </builders>
data/lib/mediawiki/selenium/env.rb CHANGED
@@ -75,8 +75,44 @@ RestClient::Request.execute(
75
75
  )
76
76
  end
77
77
  def sauce_browser(test_name, language)
78
- config = YAML.load_file("config/config.yml")
79
- browser_label = config[ENV["BROWSER_LABEL"]]
78
+ browsers = {
79
+
80
+ "chrome" =>
81
+ {"name" => "chrome",
82
+ "platform" => "Linux",
83
+ "version" => nil},
84
+
85
+ "firefox" =>
86
+ {"name" => "firefox",
87
+ "platform" => "Linux",
88
+ "version" => 26},
89
+
90
+ "internet_explorer_6" =>
91
+ {"name" => "internet_explorer",
92
+ "platform" => "Windows XP",
93
+ "version"=> 6},
94
+
95
+ "internet_explorer_7" =>
96
+ {"name" => "internet_explorer",
97
+ "platform" => "Windows XP",
98
+ "version"=> 7},
99
+
100
+ "internet_explorer_8" =>
101
+ {"name" => "internet_explorer",
102
+ "platform" => "Windows XP",
103
+ "version"=> 8},
104
+
105
+ "internet_explorer_9" =>
106
+ {"name" => "internet_explorer",
107
+ "platform" => "Windows 7",
108
+ "version"=> 9},
109
+
110
+ "internet_explorer_10" =>
111
+ {"name" => "internet_explorer",
112
+ "platform" => "Windows 8",
113
+ "version"=> 10}}
114
+
115
+ browser_label = browsers[ENV["BROWSER_LABEL"]]
80
116
 
81
117
  if language == "default"
82
118
  caps = Selenium::WebDriver::Remote::Capabilities.send(browser_label["name"])
data/lib/mediawiki/selenium/hooks.rb CHANGED
@@ -9,8 +9,6 @@ mediawiki-selenium top-level directory and at
9
9
  https://git.wikimedia.org/blob/mediawiki%2Fselenium/HEAD/CREDITS.
10
10
  =end
11
11
 
12
- config = YAML.load_file("config/config.yml")
13
-
14
12
  Before("@login") do
15
13
  ENV["MEDIAWIKI_PASSWORD"] = ENV[ENV["MEDIAWIKI_PASSWORD_VARIABLE"]] if ENV["MEDIAWIKI_PASSWORD_VARIABLE"]
16
14
  puts "MEDIAWIKI_USER environment variable is not defined! Please export a value for that variable before proceeding." unless ENV["MEDIAWIKI_USER"]
@@ -18,7 +16,6 @@ Before("@login") do
18
16
  end
19
17
 
20
18
  Before do |scenario|
21
- @config = config
22
19
  @random_string = Random.new.rand.to_s
23
20
  if ENV["REUSE_BROWSER"] == "true" and $browser # CirrusSearch and VisualEditor need this
24
21
  @browser = $browser
data/lib/mediawiki/selenium/sauce.rb CHANGED
@@ -13,8 +13,15 @@ require "cucumber/formatter/junit"
13
13
 
14
14
  module Cucumber::Formatter
15
15
  class Sauce < Junit
16
+
17
+ private
18
+
16
19
  def format_exception(exception)
17
- sauce_job_page = "Sauce Labs job URL: http://saucelabs.com/jobs/#{$session_id}\n"
20
+ if $session_id
21
+ sauce_job_page = "Sauce Labs job URL: http://saucelabs.com/jobs/#{$session_id}\n"
22
+ else
23
+ sauce_job_page = "Uh-oh. Could not find link to Sauce Labs job URL."
24
+ end
18
25
  ([sauce_job_page] + ["#{exception.message} (#{exception.class})"] + exception.backtrace).join("\n")
19
26
  end
20
27
  end
data/lib/mediawiki/selenium/version.rb CHANGED
@@ -11,6 +11,6 @@ https://git.wikimedia.org/blob/mediawiki%2Fselenium/HEAD/CREDITS.
11
11
 
12
12
  module Mediawiki
13
13
  module Selenium
14
- VERSION = "0.1.18"
14
+ VERSION = "0.1.19"
15
15
  end
16
16
  end
data/mediawiki-selenium.gemspec CHANGED
@@ -17,12 +17,12 @@ makes it easy to update the shared code.}
17
17
  spec.files = `git ls-files`.split($/)
18
18
  spec.require_paths = ["lib"]
19
19
 
20
- spec.add_runtime_dependency "cucumber"
21
- spec.add_runtime_dependency "json"
22
- spec.add_runtime_dependency "headless"
23
- spec.add_runtime_dependency "net-http-persistent"
24
- spec.add_runtime_dependency "page-object"
25
- spec.add_runtime_dependency "rest-client"
26
- spec.add_runtime_dependency "rspec-expectations"
27
- spec.add_runtime_dependency "syntax"
20
+ spec.add_runtime_dependency "cucumber", '~> 0'
21
+ spec.add_runtime_dependency "headless", '~> 0'
22
+ spec.add_runtime_dependency "json", '~> 0'
23
+ spec.add_runtime_dependency "net-http-persistent", '~> 0'
24
+ spec.add_runtime_dependency "page-object", '~> 0'
25
+ spec.add_runtime_dependency "rest-client", '~> 0'
26
+ spec.add_runtime_dependency "rspec-expectations", '~> 0'
27
+ spec.add_runtime_dependency "syntax", '~> 0'
28
28
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: mediawiki-selenium
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.18
4
+ version: 0.1.19
5
5
  platform: ruby
6
6
  authors:
7
7
  - Zeljko Filipin
@@ -14,112 +14,112 @@ dependencies:
14
14
  name: cucumber
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - ">="
17
+ - - "~>"
18
18
  - !ruby/object:Gem::Version
19
19
  version: '0'
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - ">="
24
+ - - "~>"
25
25
  - !ruby/object:Gem::Version
26
26
  version: '0'
27
27
  - !ruby/object:Gem::Dependency
28
- name: json
28
+ name: headless
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - ">="
31
+ - - "~>"
32
32
  - !ruby/object:Gem::Version
33
33
  version: '0'
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - ">="
38
+ - - "~>"
39
39
  - !ruby/object:Gem::Version
40
40
  version: '0'
41
41
  - !ruby/object:Gem::Dependency
42
- name: headless
42
+ name: json
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - ">="
45
+ - - "~>"
46
46
  - !ruby/object:Gem::Version
47
47
  version: '0'
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - ">="
52
+ - - "~>"
53
53
  - !ruby/object:Gem::Version
54
54
  version: '0'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: net-http-persistent
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - ">="
59
+ - - "~>"
60
60
  - !ruby/object:Gem::Version
61
61
  version: '0'
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - ">="
66
+ - - "~>"
67
67
  - !ruby/object:Gem::Version
68
68
  version: '0'
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: page-object
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - ">="
73
+ - - "~>"
74
74
  - !ruby/object:Gem::Version
75
75
  version: '0'
76
76
  type: :runtime
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - ">="
80
+ - - "~>"
81
81
  - !ruby/object:Gem::Version
82
82
  version: '0'
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: rest-client
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
- - - ">="
87
+ - - "~>"
88
88
  - !ruby/object:Gem::Version
89
89
  version: '0'
90
90
  type: :runtime
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
- - - ">="
94
+ - - "~>"
95
95
  - !ruby/object:Gem::Version
96
96
  version: '0'
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: rspec-expectations
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
- - - ">="
101
+ - - "~>"
102
102
  - !ruby/object:Gem::Version
103
103
  version: '0'
104
104
  type: :runtime
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
- - - ">="
108
+ - - "~>"
109
109
  - !ruby/object:Gem::Version
110
110
  version: '0'
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: syntax
113
113
  requirement: !ruby/object:Gem::Requirement
114
114
  requirements:
115
- - - ">="
115
+ - - "~>"
116
116
  - !ruby/object:Gem::Version
117
117
  version: '0'
118
118
  type: :runtime
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  requirements:
122
- - - ">="
122
+ - - "~>"
123
123
  - !ruby/object:Gem::Version
124
124
  version: '0'
125
125
  description: |-
@@ -135,7 +135,7 @@ files:
135
135
  - CREDITS
136
136
  - LICENSE
137
137
  - README.md
138
- - docs/UploadWizard-commons.wikimedia.org.md
138
+ - docs/UploadWizard.md
139
139
  - docs/jenkins-email.template
140
140
  - docs/jenkins.md
141
141
  - docs/job.md