Produced by Araxis Merge on 10/4/2017 8:04:43 AM Central Daylight Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | rdk.zip\rdk\product\tests\rspec-tests\lib\helper | DefaultLogin.rb | Mon Aug 21 12:51:01 2017 UTC |
| 2 | rdk.zip\rdk\product\tests\rspec-tests\lib\helper | DefaultLogin.rb | Wed Oct 4 12:29:28 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 8 | 84 |
| Changed | 7 | 16 |
| Inserted | 0 | 0 |
| Removed | 0 | 0 |
| Whitespace | |
|---|---|
| Character case | Differences in character case are significant |
| Line endings | Differences in line endings (CR and LF characters) are ignored |
| CR/LF characters | Not shown in the comparison detail |
No regular expressions were active.
| 1 | require 'h ttparty' | |
| 2 | ||
| 3 | class Defa ultLogin | |
| 4 | @@defaul t_wait_tim e = 50 | |
| 5 | ||
| 6 | if ENV.k eys.includ e?('RDK_FE TCH_HOST') | |
| 7 | @@rdk_fetc h_url = EN V.keys.inc lude?('RDK _FETCH_HOS T') ? 'htt p://' + EN V['RDK_FET CH_HOST'] + ":" + EN V['RDK_FET CH_PORT'] : "http:// IP " | |
| 8 | else | |
| 9 | @@rdk_fetc h_url = EN V.keys.inc lude?('RDK _IP') ? 'h ttp://' + ENV['RDK_I P'] + ":" + ENV["RDK _PORT"] : "http:// IP " | |
| 10 | end | |
| 11 | ||
| 12 | @@rdk_writ eback_url = ENV.keys .include?( 'RDK_WRITE BACK_HOST' ) ? 'http: //' + ENV[ 'RDK_WRITE BACK_HOST' ] + ":" + ENV["RDK_W RITEBACK_P ORT"] : "h ttp:// IP " | |
| 13 | @@rdk_pick list_url = ENV.keys. include?(' RDK_PICKLI ST_HOST') ? 'http:// ' + ENV['R DK_PICKLIS T_HOST'] + ":" + ENV ["RDK_PICK LIST_PORT" ] : "http: // IP " | |
| 14 | ||
| 15 | if ENV.k eys.includ e?('JDS_HO ST') | |
| 16 | @@jds_url = ENV.keys .include?( 'JDS_HOST' ) ? 'http: //' + ENV[ 'JDS_HOST' ] + ":" + ENV['JDS_P ORT'] : 'http:// IP ' | |
| 17 | else | |
| 18 | @@jds_url = ENV.keys .include?( 'JDS_IP') ? 'http:// ' + ENV['J DS_IP'] + ": PORT " : "http: // IP " | |
| 19 | end | |
| 20 | ||
| 21 | if ENV.k eys.includ e?('VISTA_ PANORAMA_H OST') | |
| 22 | @@vista_ur l = ENV.ke ys.include ?('VISTA_P ANORAMA_HO ST') ? 'ht tp://' + E NV['VISTA_ PANORAMA_H OST'] + ": " + ENV['V ISTA_PANOR AMA_PORT'] : 'http:// IP ' | |
| 23 | else | |
| 24 | @@vista_ur l = ENV.ke ys.include ?('VISTA_I P') ? 'htt p://' + EN V['VISTA_I P'] + ":" : "http:// IP " | |
| 25 | end | |
| 26 | ||
| 27 | def self .rdk_write back_url | |
| 28 | return @@rdk_wri teback_url | |
| 29 | end | |
| 30 | ||
| 31 | def self .rdk_pickl ist_url | |
| 32 | return @@rdk_pic klist_url | |
| 33 | end | |
| 34 | ||
| 35 | def self .rdk_fetch _url | |
| 36 | return @@rdk_fet ch_url | |
| 37 | end | |
| 38 | ||
| 39 | def self .wait_time | |
| 40 | return @@default _wait_time | |
| 41 | end | |
| 42 | ||
| 43 | def self .jds_url | |
| 44 | return @@jds_url | |
| 45 | end | |
| 46 | ||
| 47 | def self .vista_url | |
| 48 | return @@vista_u rl | |
| 49 | end | |
| 50 | end |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.