Skip to content

fix urlhelper::domain #147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kambizzandi merged 1 commit into from
Jul 6, 2022
Merged

fix urlhelper::domain #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Interfaces/Helpers/URLHelper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ QString URLHelper::domain(QString _url, bool _stripProtocol) {
Domain.chop(1);

if (_stripProtocol) {
if (_url.startsWith("http://"))
if (Domain.startsWith("http://"))
Domain = Domain.mid(7);
else if (_url.startsWith("https://"))
else if (Domain.startsWith("https://"))
Domain = Domain.mid(8);
}

Expand Down
11 changes: 11 additions & 0 deletions unitTest/testMacros.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ using namespace std;
#include "Interfaces/Common/QtTypes.hpp"
#include "Interfaces/Common/GenericTypes.h"
#include "Interfaces/Helpers/IteratorHelper.hpp"
#include "Interfaces/Helpers/URLHelper.h"

using namespace Targoman;
using namespace Targoman::API::Helpers;
Expand Down Expand Up @@ -396,6 +397,16 @@ private slots:
;
}

void test_URLHelper() {
qDebug() << URLHelper::domain("Dev.Test", false);
qDebug() << URLHelper::domain("http://Dev.Test", false);
qDebug() << URLHelper::domain("https://Dev.Test", false);

qDebug() << URLHelper::domain("Dev.Test", true);
qDebug() << URLHelper::domain("http://Dev.Test", true);
qDebug() << URLHelper::domain("https://Dev.Test", true);
}

};

#endif // TESTMACROS_HPP