Skip to content

Commit cdb29ee

Browse files
committed
updating user and key caps
1 parent 3a50383 commit cdb29ee

File tree

15 files changed

+46
-51
lines changed

15 files changed

+46
-51
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ Code samples to get started with Appium tests for your Native App using the Cucu
77
## Setup
88
### Requirements
99

10-
1. Ruby
11-
2. Bundler
10+
1. Ruby: If you don't have Ruby installed, follow the instructions given [here](https://www.ruby-lang.org/en/documentation/installation/)
11+
2. Bundler : If you dont have Bundler installed, follow the instructions given [here](https://bundler.io/)
1212

1313
### Install the dependencies
1414

android/examples/Rakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Cucumber::Rake::Task.new(:distinct) do |task|
1919
end
2020

2121
task :parallel do |t, args|
22-
@num_parallel = 4
22+
@num_parallel = 2
2323

2424
Parallel.map([*1..@num_parallel], :in_processes => @num_parallel) do |task_id|
2525
ENV["TASK_ID"] = (task_id - 1).to_s
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
server: "hub-cloud.browserstack.com"
2-
username: "BROWSERSTACK_USERNAME"
3-
access_key: "BROWSERSTACK_ACCESS_KEY"
42

53
common_caps:
4+
"browserstack.user": "BROWSERSTACK_USERNAME"
5+
"browserstack.key": "BROWSERSTACK_ACCESS_KEY"
66
"project": "First Cucumber Android Project"
77
"build": "Cucumber Android"
88
"browserstack.debug": true
@@ -11,5 +11,5 @@ browser_caps:
1111
-
1212
"device": "Google Pixel 3"
1313
"os_version": "9.0"
14-
"app": "bs://<app-id>"
14+
"app": "bs://24066b2934ed9885f2e4d3282d9bb49105060e51"
1515
"name": "first_test"

android/examples/run-first-test/features/support/env.rb

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@
88
CONFIG_NAME = ENV['CONFIG_NAME'] || 'first'
99

1010
CONFIG = YAML.load(File.read(File.join(File.dirname(__FILE__), "../../config/#{CONFIG_NAME}.config.yml")))
11-
CONFIG['username'] = ENV['BROWSERSTACK_USERNAME'] || CONFIG['username']
12-
CONFIG['access_key'] = ENV['BROWSERSTACK_ACCESS_KEY'] || CONFIG['access_key']
1311

1412
caps = CONFIG['common_caps'].merge(CONFIG['browser_caps'][TASK_ID])
13+
caps['browserstack.user'] = ENV['BROWSERSTACK_USERNAME'] || caps['browserstack.user']
14+
caps['browserstack.key'] = ENV['BROWSERSTACK_ACCESS_KEY'] || caps['browserstack.key']
15+
1516
$bs_local = nil
1617

1718
if ENV['BROWSERSTACK_APP_ID']
@@ -21,7 +22,7 @@
2122
desired_caps = {
2223
caps: caps,
2324
appium_lib: {
24-
server_url: "http://#{CONFIG['username']}:#{CONFIG['access_key']}@#{CONFIG['server']}/wd/hub"
25+
server_url: "http://#{CONFIG['server']}/wd/hub"
2526
}
2627
}
2728

android/examples/run-local-test/config/local.config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
server: "hub-cloud.browserstack.com"
2-
username: "BROWSERSTACK_USERNAME"
3-
access_key: "BROWSERSTACK_ACCESS_KEY"
42

53
common_caps:
4+
"browserstack.user": "BROWSERSTACK_USERNAME"
5+
"browserstack.key": "BROWSERSTACK_ACCESS_KEY"
66
"project": "First Cucumber Android Project"
77
"build": "Cucumber Android"
88
"browserstack.debug": true

android/examples/run-local-test/features/support/env.rb

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@
88
CONFIG_NAME = ENV['CONFIG_NAME'] || 'local'
99

1010
CONFIG = YAML.load(File.read(File.join(File.dirname(__FILE__), "../../config/#{CONFIG_NAME}.config.yml")))
11-
CONFIG['username'] = ENV['BROWSERSTACK_USERNAME'] || CONFIG['username']
12-
CONFIG['access_key'] = ENV['BROWSERSTACK_ACCESS_KEY'] || CONFIG['access_key']
1311

1412
caps = CONFIG['common_caps'].merge(CONFIG['browser_caps'][TASK_ID])
13+
caps['browserstack.user'] = ENV['BROWSERSTACK_USERNAME'] || caps['browserstack.user']
14+
caps['browserstack.key'] = ENV['BROWSERSTACK_ACCESS_KEY'] || caps['browserstack.key']
15+
1516
$bs_local = nil
1617

1718
if ENV['BROWSERSTACK_APP_ID']
@@ -20,14 +21,14 @@
2021

2122
if caps['browserstack.local'] && caps['browserstack.local'].to_s == 'true'
2223
$bs_local = BrowserStack::Local.new
23-
bs_local_args = { "key" => "#{CONFIG['access_key']}" }
24+
bs_local_args = { "key" => "#{caps['browserstack.key']}" }
2425
$bs_local.start(bs_local_args)
2526
end
2627

2728
desired_caps = {
2829
caps: caps,
2930
appium_lib: {
30-
server_url: "http://#{CONFIG['username']}:#{CONFIG['access_key']}@#{CONFIG['server']}/wd/hub"
31+
server_url: "http://#{CONFIG['server']}/wd/hub"
3132
}
3233
}
3334

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
server: "hub-cloud.browserstack.com"
2-
username: "BROWSERSTACK_USERNAME"
3-
access_key: "BROWSERSTACK_ACCESS_KEY"
42

53
common_caps:
4+
"browserstack.user": "BROWSERSTACK_USERNAME"
5+
"browserstack.key": "BROWSERSTACK_ACCESS_KEY"
66
"project": "First Cucumber Android Project"
77
"build": "Cucumber Android"
88
"browserstack.debug": true
@@ -12,19 +12,9 @@ browser_caps:
1212
"device": "Google Pixel 3"
1313
"os_version": "9.0"
1414
"app" : "bs://<app-id>"
15-
"name": "parallel_test-1"
16-
-
17-
"device": "Google Pixel 3"
18-
"os_version": "9.0"
19-
"app" : "bs://<app-id>"
20-
"name": "parallel_test-2"
21-
-
22-
"device": "Samsung Galaxy S10e"
23-
"os_version": "9.0"
24-
"app" : "bs://<app-id>"
25-
"name": "parallel_test-3"
15+
"name": "parallel_test_1"
2616
-
2717
"device": "Samsung Galaxy S10e"
2818
"os_version": "9.0"
2919
"app" : "bs://<app-id>"
30-
"name": "parallel_test-4"
20+
"name": "parallel_test_2"

android/examples/run-parallel-tests/features/support/env.rb

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@
88
CONFIG_NAME = ENV['CONFIG_NAME'] || 'parallel'
99

1010
CONFIG = YAML.load(File.read(File.join(File.dirname(__FILE__), "../../config/#{CONFIG_NAME}.config.yml")))
11-
CONFIG['username'] = ENV['BROWSERSTACK_USERNAME'] || CONFIG['username']
12-
CONFIG['access_key'] = ENV['BROWSERSTACK_ACCESS_KEY'] || CONFIG['access_key']
1311

1412
caps = CONFIG['common_caps'].merge(CONFIG['browser_caps'][TASK_ID])
13+
caps['browserstack.user'] = ENV['BROWSERSTACK_USERNAME'] || caps['browserstack.user']
14+
caps['browserstack.key'] = ENV['BROWSERSTACK_ACCESS_KEY'] || caps['browserstack.key']
15+
1516
$bs_local = nil
1617

1718
if ENV['BROWSERSTACK_APP_ID']
@@ -21,7 +22,7 @@
2122
desired_caps = {
2223
caps: caps,
2324
appium_lib: {
24-
server_url: "http://#{CONFIG['username']}:#{CONFIG['access_key']}@#{CONFIG['server']}/wd/hub"
25+
server_url: "http://#{CONFIG['server']}/wd/hub"
2526
}
2627
}
2728

ios/examples/run-first-test/config/first.config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
server: "hub-cloud.browserstack.com"
2-
username: "BROWSERSTACK_USERNAME"
3-
access_key: "BROWSERSTACK_ACCESS_KEY"
42

53
common_caps:
4+
"browserstack.user": "BROWSERSTACK_USERNAME"
5+
"browserstack.key": "BROWSERSTACK_ACCESS_KEY"
66
"project": "First Cucumber iOS Project"
77
"build": "Cucumber iOS"
88
"browserstack.debug": true

ios/examples/run-first-test/features/support/env.rb

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@
88
CONFIG_NAME = ENV['CONFIG_NAME'] || 'first'
99

1010
CONFIG = YAML.load(File.read(File.join(File.dirname(__FILE__), "../../config/#{CONFIG_NAME}.config.yml")))
11-
CONFIG['username'] = ENV['BROWSERSTACK_USERNAME'] || CONFIG['username']
12-
CONFIG['access_key'] = ENV['BROWSERSTACK_ACCESS_KEY'] || CONFIG['access_key']
1311

1412
caps = CONFIG['common_caps'].merge(CONFIG['browser_caps'][TASK_ID])
13+
caps['browserstack.user'] = ENV['BROWSERSTACK_USERNAME'] || caps['browserstack.user']
14+
caps['browserstack.key'] = ENV['BROWSERSTACK_ACCESS_KEY'] || caps['browserstack.key']
15+
1516
$bs_local = nil
1617

1718
if ENV['BROWSERSTACK_APP_ID']
@@ -21,7 +22,7 @@
2122
desired_caps = {
2223
caps: caps,
2324
appium_lib: {
24-
server_url: "http://#{CONFIG['username']}:#{CONFIG['access_key']}@#{CONFIG['server']}/wd/hub"
25+
server_url: "http://#{CONFIG['server']}/wd/hub"
2526
}
2627
}
2728

0 commit comments

Comments
 (0)