Produced by Araxis Merge on 10/2/2017 7:00:31 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 | cds.zip\cds\product\tests\acceptance-tests\features\steps\helper | DefaultLogin.rb | Thu Mar 16 15:17:48 2017 UTC |
| 2 | cds.zip\cds\product\tests\acceptance-tests\features\steps\helper | DefaultLogin.rb | Wed Sep 27 16:37:54 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 12 | 130 |
| Changed | 11 | 24 |
| 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 | # TODO: Once RDK_F ETCH_HOST is defined and RDK_I P is remov ed, clean up code be low. Ref. US7931 | |
| 7 | if ENV.k eys.includ e?('RDK_FE TCH_HOST') | |
| 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'] : "http:// IP " | |
| 9 | else | |
| 10 | @@rdk_fetc h_url = EN V.keys.inc lude?('RDK _IP') ? 'h ttp://' + ENV['RDK_I P'] + ":" + ENV["RDK _PORT"] : "http:// IP " | |
| 11 | end | |
| 12 | ||
| 13 | @@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 " | |
| 14 | @@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 " | |
| 15 | ||
| 16 | # TODO: Once JDS_H OST is def ined and J DS_IP is r emoved, cl ean up cod e below. Ref. US793 1 | |
| 17 | if ENV.k eys.includ e?('JDS_HO ST') | |
| 18 | @@jds_url = ENV.keys .include?( 'JDS_HOST' ) ? 'http: //' + ENV[ 'JDS_HOST' ] + ":" + ENV['JDS_P ORT'] : 'http:// IP ' | |
| 19 | else | |
| 20 | @@jds_url = ENV.keys .include?( 'JDS_IP') ? 'http:// ' + ENV['J DS_IP'] + ":9080" : "http:// IP " | |
| 21 | end | |
| 22 | ||
| 23 | @@cdsinvoc ation_url = ENV.keys .include?( 'CDSINVOCA TION_IP') && ENV.key s.include? ('CDSINVOC ATION_PORT ') ? 'http ://' + ENV ['CDSINVOC ATION_IP'] + ":" + E NV['CDSINV OCATION_PO RT'] : 'http:// IP ' | |
| 24 | ||
| 25 | @@cdsdb_ur l = ENV.ke ys.include ?('CDSDB_I P') && ENV .keys.incl ude?('CDSD B_PORT') ? "https:// #{ENV['CDS DB_IP']}:# {ENV['CDSD B_PORT']}" : 'https: // IP 7' | |
| 26 | ||
| 27 | @@opencds_ url = ENV. keys.inclu de?('OPENC DS_IP') && ENV.keys. include?(' OPENCDS_PO RT') ? "ht tp://#{ENV ['OPENCDS_ IP']}:#{EN V['OPENCDS _PORT']}" : 'http:// IP ' | |
| 28 | ||
| 29 | @@cdsdashb oard_url = ENV.keys. include?(' CDSDASHBOA RD_IP') && ENV.keys. include?(' CDSDASHBOA RD_PORT') ? "http:// #{ENV['CDS DASHBOARD_ IP']}:#{EN V['CDSDASH BOARD_PORT ']}" : 'ht tp:// IP ' | |
| 30 | ||
| 31 | # TODO: Once VISTA _PANORAMA_ HOST is de fined and VISTA_IP i s removed, clean up code below . Ref. US 7931 | |
| 32 | if ENV.k eys.includ e?('VISTA_ PANORAMA_H OST') | |
| 33 | @@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 ' | |
| 34 | else | |
| 35 | @@vista_ur l = ENV.ke ys.include ?('VISTA_I P') ? 'htt p://' + EN V['VISTA_I P'] + ":" : "http:// IP " | |
| 36 | end | |
| 37 | ||
| 38 | def self .rdk_write back_url | |
| 39 | return @@rdk_wri teback_url | |
| 40 | end | |
| 41 | ||
| 42 | def self .rdk_pickl ist_url | |
| 43 | return @@rdk_pic klist_url | |
| 44 | end | |
| 45 | ||
| 46 | def self .rdk_fetch _url | |
| 47 | return @@rdk_fet ch_url | |
| 48 | end | |
| 49 | ||
| 50 | def self .wait_time | |
| 51 | return @@default _wait_time | |
| 52 | end | |
| 53 | ||
| 54 | def self .jds_url | |
| 55 | return @@jds_url | |
| 56 | end | |
| 57 | ||
| 58 | def self .vista_url | |
| 59 | return @@vista_u rl | |
| 60 | end | |
| 61 | ||
| 62 | def self .cdsinvoca tion_url | |
| 63 | return @@cdsinvo cation_url | |
| 64 | end | |
| 65 | ||
| 66 | def self .cdsdb_url | |
| 67 | return @@cdsdb_u rl | |
| 68 | end | |
| 69 | ||
| 70 | def self .opencds_u rl | |
| 71 | return @@opencds _url | |
| 72 | end | |
| 73 | ||
| 74 | def self .cdsdashbo ard_url | |
| 75 | return @@cdsdash board_url | |
| 76 | end | |
| 77 | end |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.