Skip to content

Commit 3e75428

Browse files
committed
/series/import/request/{id}: link to imported series should not use fixed domain.
Fix #736
1 parent 37f9f0e commit 3e75428

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

src/main/java/ru/mystamps/web/Url.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ public static Map<String, String> asMap(boolean production) {
130130

131131
// Not all URLs are listed here but only those that are being used on views
132132
Map<String, String> map = new HashMap<>();
133-
map.put("PUBLIC_URL", PUBLIC_URL);
133+
map.put("PUBLIC_URL", production ? PUBLIC_URL : SITE);
134134
map.put("AUTHENTICATION_PAGE", AUTHENTICATION_PAGE);
135135
map.put("LOGIN_PAGE", LOGIN_PAGE);
136136
map.put("LOGOUT_PAGE", LOGOUT_PAGE);

src/test/robotframework/series/import/request-logic.robot

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
*** Settings ***
22
Documentation Verify scenarios of importing a series from an external site
33
Library Selenium2Library
4-
Library String
54
Resource ../../auth.steps.robot
65
Suite Setup Before Test Suite
76
Suite Teardown After Test Suite
@@ -43,9 +42,7 @@ Import series from an external site (in English, use category, country and date
4342
Go To ${requestLocation}
4443
Element Text Should Be id=request-status ImportSucceeded
4544
Element Should Be Disabled id=create-series-btn
46-
# @todo #700 /series/import/request/{id}: link to imported series should not use fixed domain
47-
${expectedSeriesLink}= Replace String ${seriesLocation} ${SITE_URL} https://my-stamps.ru
48-
Page Should Contain Link link=${expectedSeriesLink}
45+
Page Should Contain Link link=${seriesLocation}
4946

5047
Import series from an external site (in Russian, use description locator)
5148
[Documentation] Verify import from a page in Russian and shared locator

0 commit comments

Comments
 (0)