Produced by Araxis Merge on 10/4/2017 8:04:41 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\acceptance-tests\features\steps\helper | DefaultLogin.rb | Mon Aug 21 12:51:01 2017 UTC |
| 2 | rdk.zip\rdk\product\tests\acceptance-tests\features\steps\helper | DefaultLogin.rb | Tue Oct 3 19:58:00 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 4 | 66 |
| Changed | 3 | 10 |
| 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 | local_ip = "http:// IP " | |
| 7 | ||
| 8 | @@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"] : "#{local _ip}: PORT " | |
| 9 | @@rdk_writ eback_url = ENV.keys .include?( 'RDK_WRITE BACK_HOST' ) ? 'http: //' + ENV[ 'RDK_WRITE BACK_HOST' ] + ":" + ENV["RDK_W RITEBACK_P ORT"] : "# {local_ip} : PORT " | |
| 10 | @@rdk_pi cklist_url = ENV.key s.include? ('RDK_PICK LIST_HOST' ) ? 'http: //' + ENV[ 'RDK_PICKL IST_HOST'] + ":" + E NV["RDK_PI CKLIST_POR T"] : "#{l ocal_ip}:7 777" | |
| 11 | ||
| 12 | @@jds_url = ENV.keys .include?( 'JDS_IP') ? 'http:// ' + ENV['J DS_IP'] + ": PORT " : "http: // IP " | |
| 13 | @@pjds_url = ENV.key s.include? ('PJDS_IP' ) ? 'http: //' + ENV[ 'PJDS_IP'] + ": PORT " : "http: // IP " | |
| 14 | ||
| 15 | def self .rdk_write back_url | |
| 16 | return @@rdk_wri teback_url | |
| 17 | end | |
| 18 | ||
| 19 | def self .rdk_pickl ist_url | |
| 20 | return @@rdk_pic klist_url | |
| 21 | end | |
| 22 | ||
| 23 | def self .rdk_fetch _url | |
| 24 | return @@rdk_fet ch_url | |
| 25 | end | |
| 26 | ||
| 27 | def self .wait_time | |
| 28 | return @@default _wait_time | |
| 29 | end | |
| 30 | ||
| 31 | def self .jds_url | |
| 32 | return @@jds_url | |
| 33 | end | |
| 34 | ||
| 35 | def self .pjds_url | |
| 36 | return @@pjds_ur l | |
| 37 | end | |
| 38 | end |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.